lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent quest timer start when NPC is dead.

Browse Source
This commit is contained in:
MobiusDev
2018-08-30 19:06:45 +00:00
parent 8769eb4926
commit 9af5336ce2
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java vendored
View File

@@ -40,9 +40,9 @@ public final class TrainningSoldier extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) 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)) for (L2Npc nearby : L2World.getInstance().getVisibleObjects(npc, L2Npc.class, 150))
{ {

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java vendored
View File

@@ -46,9 +46,9 @@ public final class YeSagiraGuards extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) 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<L2MonsterInstance> nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000); final List<L2MonsterInstance> nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000);
if (!nearbyMonsters.isEmpty()) if (!nearbyMonsters.isEmpty())

4
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java vendored
View File

@@ -40,9 +40,9 @@ public final class TrainningSoldier extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) 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)) for (L2Npc nearby : L2World.getInstance().getVisibleObjects(npc, L2Npc.class, 150))
{ {

4
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java vendored
View File

@@ -46,9 +46,9 @@ public final class YeSagiraGuards extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) 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<L2MonsterInstance> nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000); final List<L2MonsterInstance> nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000);
if (!nearbyMonsters.isEmpty()) if (!nearbyMonsters.isEmpty())

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java vendored
View File

@@ -40,9 +40,9 @@ public final class TrainningSoldier extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) 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)) for (L2Npc nearby : L2World.getInstance().getVisibleObjects(npc, L2Npc.class, 150))
{ {

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java vendored
View File

@@ -46,9 +46,9 @@ public final class YeSagiraGuards extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) 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<L2MonsterInstance> nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000); final List<L2MonsterInstance> nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000);
if (!nearbyMonsters.isEmpty()) if (!nearbyMonsters.isEmpty())

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java vendored
View File

@@ -40,9 +40,9 @@ public final class TrainningSoldier extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) 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)) for (L2Npc nearby : L2World.getInstance().getVisibleObjects(npc, L2Npc.class, 150))
{ {

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java vendored
View File

@@ -46,9 +46,9 @@ public final class YeSagiraGuards extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) 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<L2MonsterInstance> nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000); final List<L2MonsterInstance> nearbyMonsters = L2World.getInstance().getVisibleObjects(npc, L2MonsterInstance.class, 1000);
if (!nearbyMonsters.isEmpty()) if (!nearbyMonsters.isEmpty())