stuck NPC debugging & fix overlooked NPE with badluckmitigation

Author: Hubcapp

server/src/com/openrsc/server/Server.java

@@ -4,6 +4,7 @@
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.openrsc.server.constants.Constants;
+import com.openrsc.server.constants.Skill;
 import com.openrsc.server.content.achievement.AchievementSystem;
 import com.openrsc.server.database.GameDatabase;
 import com.openrsc.server.database.JDBCDatabase;
@@ -681,6 +682,24 @@ public void run() {
 
 							incrementLastDoCleanupDuration(getGameUpdater().doCleanup());
 							getGameEventHandler().cleanupEvents();
+
+							// TODO: remove this vacuum service. It is for debugging.
+							for (final Npc npc : getWorld().getNpcs()) {
+								if (npc.getCombatEvent() != null) {
+									if (!npc.getCombatEvent().isRunning() && npc.getOpponent() != null) {
+										if (config.WANT_DISCORD_GENERAL_LOGGING) {
+											getDiscordService().playerLog((Player)npc.getOpponent(), "An NPC with ID " + npc.getID() + ":" + npc.getIndex() + " @ " + npc.getX() + "," + npc.getY() + " was stuck, and should be unstuck now. You have some debugging still to do.");
+										}
+										
+										if (npc.getSkills().getLevel(Skill.HITS.id()) <= 0) {
+											npc.killedBy(npc.getOpponent()); // possibly not actually who killed them e.g. ranged/mage kill
+										}
+										npc.resetCombatEvent();
+									}
+								}
+							}
+							// TODO: end remove section
+
 						} catch (final Throwable t) {
 							LOGGER.catching(t);
 						}

server/src/com/openrsc/server/content/DropTable.java

@@ -144,8 +144,10 @@ public ArrayList<Item> rollItem(boolean ringOfWealth, Player owner) {
 		for (Drop drop : rollTable.drops) {
 			sum += drop.weight;
 			int threshold = sum;
-			if (drop.type == dropType.ITEM && owner.getWorld().getNpcDrops().getBadLuckMitigation().shouldMitigateBadLuck(getDropTableId(), drop.id)) {
-				threshold += owner.getWorld().getNpcDrops().getBadLuckMitigation().getRollModifier(owner, getDropTableId(), drop.id);
+			if (owner.getConfig().WANT_CUSTOM_QUESTS) { // must check this or else BadLuckMitigation might not be initialized & cause NPE
+				if (drop.type == dropType.ITEM && owner.getWorld().getNpcDrops().getBadLuckMitigation().shouldMitigateBadLuck(getDropTableId(), drop.id)) {
+					threshold += owner.getWorld().getNpcDrops().getBadLuckMitigation().getRollModifier(owner, getDropTableId(), drop.id);
+				}
 			}
 			if (threshold > hit) {
 				// If it's not a reroll, and the user is wearing a ring of wealth,

server/src/com/openrsc/server/event/rsc/impl/combat/CombatEvent.java

@@ -323,17 +323,6 @@ public void resetCombat() {
 				defenderMob.setSprite(4);
 				defenderMob.setCombatTimer();
 				defenderMob.face(defenderMob.getX(), defenderMob.getY() - 1);
-				if(defenderMob.isPlayer()){
-					Player p1;
-					p1 = ((Player) defenderMob);
-					if (p1.getParty() != null){
-						for (Player player : getWorld().getPlayers()) {
-							if(p1.getParty() == player.getParty()){
-								//ActionSender.sendParty(p);
-							}
-						}
-					}
-				}
 			}
 			if (attackerMob != null) {
 				if (attackerMob.isPlayer()) {
@@ -348,16 +337,26 @@ public void resetCombat() {
 				attackerMob.setSprite(4);
 				attackerMob.setCombatTimer();
 				attackerMob.face(attackerMob.getX(), attackerMob.getY() - 1);
-				if(attackerMob.isPlayer()){
-					Player p2;
-					p2 = ((Player) attackerMob);
-					if (p2.getParty() != null){
-						for (Player player : getWorld().getPlayers()) {
-							if(p2.getParty() == player.getParty()){
-								//ActionSender.sendParty(p);
-							}
-						}
-					}
+			}
+		} else {
+			// combat event was reset while combat event wasn't running.
+			// possible race condition; we will want to clean most things up if this happens.
+			if (defenderMob != null) {
+				defenderMob.setOpponent(null);
+				defenderMob.setCombatEvent(null);
+				defenderMob.setHitsMade(0);
+				if (defenderMob.getSprite() > 7) {
+					defenderMob.setSprite(4);
+					defenderMob.face(defenderMob.getX(), defenderMob.getY() - 1);
+				}
+			}
+			if (attackerMob != null) {
+				attackerMob.setOpponent(null);
+				attackerMob.setCombatEvent(null);
+				attackerMob.setHitsMade(0);
+				if (attackerMob.getSprite() > 7) {
+					attackerMob.setSprite(4);
+					attackerMob.face(attackerMob.getX(), attackerMob.getY() - 1);
 				}
 			}
 		}