From 9af5336ce2e24bf6a5c3c596c9faa9e1197dc1e3 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 30 Aug 2018 19:06:45 +0000 Subject: [PATCH] Prevent quest timer start when NPC is dead. --- .../data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java | 4 ++-- .../data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java | 4 ++-- .../data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java | 4 ++-- .../data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java | 4 ++-- .../data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java | 4 ++-- .../data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java | 4 ++-- .../data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java | 4 ++-- .../data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java index 9e10b3b24d..ae6ef5fab3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java @@ -40,9 +40,9 @@ public final class TrainningSoldier extends AbstractNpcAI @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - if ((npc != null)) + if ((npc != null) && !npc.isDead()) { - if (!npc.isInCombat() && !npc.isDead()) + if (!npc.isInCombat()) { for (L2Npc nearby : L2World.getInstance().getVisibleObjects(npc, L2Npc.class, 150)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java index 0304f576ce..7a71860f33 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java @@ -46,9 +46,9 @@ public final class YeSagiraGuards extends AbstractNpcAI @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - if ((npc != null)) + if ((npc != null) && !npc.isDead()) { - if (!npc.isInCombat() && !npc.isDead()) + if (!npc.isInCombat()) { final List nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000); if (!nearbyMonsters.isEmpty()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java index 9e10b3b24d..ae6ef5fab3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java @@ -40,9 +40,9 @@ public final class TrainningSoldier extends AbstractNpcAI @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - if ((npc != null)) + if ((npc != null) && !npc.isDead()) { - if (!npc.isInCombat() && !npc.isDead()) + if (!npc.isInCombat()) { for (L2Npc nearby : L2World.getInstance().getVisibleObjects(npc, L2Npc.class, 150)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java index 0304f576ce..7a71860f33 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java @@ -46,9 +46,9 @@ public final class YeSagiraGuards extends AbstractNpcAI @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - if ((npc != null)) + if ((npc != null) && !npc.isDead()) { - if (!npc.isInCombat() && !npc.isDead()) + if (!npc.isInCombat()) { final List nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000); if (!nearbyMonsters.isEmpty()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java index 9e10b3b24d..ae6ef5fab3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java @@ -40,9 +40,9 @@ public final class TrainningSoldier extends AbstractNpcAI @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - if ((npc != null)) + if ((npc != null) && !npc.isDead()) { - if (!npc.isInCombat() && !npc.isDead()) + if (!npc.isInCombat()) { for (L2Npc nearby : L2World.getInstance().getVisibleObjects(npc, L2Npc.class, 150)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java index 0304f576ce..7a71860f33 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java @@ -46,9 +46,9 @@ public final class YeSagiraGuards extends AbstractNpcAI @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - if ((npc != null)) + if ((npc != null) && !npc.isDead()) { - if (!npc.isInCombat() && !npc.isDead()) + if (!npc.isInCombat()) { final List nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000); if (!nearbyMonsters.isEmpty()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java index 9e10b3b24d..ae6ef5fab3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java @@ -40,9 +40,9 @@ public final class TrainningSoldier extends AbstractNpcAI @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - if ((npc != null)) + if ((npc != null) && !npc.isDead()) { - if (!npc.isInCombat() && !npc.isDead()) + if (!npc.isInCombat()) { for (L2Npc nearby : L2World.getInstance().getVisibleObjects(npc, L2Npc.class, 150)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java index 0304f576ce..7a71860f33 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java @@ -46,9 +46,9 @@ public final class YeSagiraGuards extends AbstractNpcAI @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - if ((npc != null)) + if ((npc != null) && !npc.isDead()) { - if (!npc.isInCombat() && !npc.isDead()) + if (!npc.isInCombat()) { final List nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000); if (!nearbyMonsters.isEmpty())