Quellcode durchsuchen

BETA: Fishing monster AI fixes:
* NPE vulnerability fix.
* Canceling quest timer on kill, not needed after monster is dead.

Patch by: Zoey76, lion

Zoey76 vor 12 Jahren
Ursprung
Commit
a18bbd3698

+ 2 - 1
L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java

@@ -80,7 +80,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equals("DESPAWN"))
+		if ((npc != null) && event.equals("DESPAWN"))
 		{
 			npc.deleteMe();
 		}
@@ -101,6 +101,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
 		npc.broadcastPacket(new NpcSay(npc, Say2.NPC_ALL, NPC_STRINGS_ON_KILL[getRandom(NPC_STRINGS_ON_KILL.length)]));
+		cancelQuestTimer("DESPAWN", npc, killer);
 		return null;
 	}