From fd0bfda8a79d80e267625896a87a7d802a9ba1fa Mon Sep 17 00:00:00 2001 From: dginovker Date: Fri, 4 Sep 2020 08:57:03 -0400 Subject: [PATCH] Bootleg fix for NPC aggro crash --- .../game/content/combat/npcs/NpcAggressive.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcAggressive.java b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcAggressive.java index 218d9190..02cba64c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcAggressive.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcAggressive.java @@ -20,12 +20,16 @@ public class NpcAggressive { }; public static boolean isAggressive(int i) { - boolean aggressive = NpcHandler.npcs[i].inWild() || PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || FightCaves.isFightCaveNpc(i); - for (int element : AGGRESSIVE_MONSTERS) { - if (NpcHandler.npcs[i].npcType == element || aggressive) { - return true; + try { + boolean aggressive = NpcHandler.npcs[i].inWild() || PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || FightCaves.isFightCaveNpc(i); + for (int element : AGGRESSIVE_MONSTERS) { + if (NpcHandler.npcs[i].npcType == element || aggressive) { + return true; + } } + return false; + } catch (NullPointerException) { + return false; } - return false; } }