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

Fixed GardenWatchman AI spawn NPE.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-09-21 08:25:44 +00:00
parent 8a156f63fc
commit 340338d820
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java vendored
View File

@ -54,7 +54,7 @@ public class GardenWatchman extends AbstractNpcAI
{
case "SPAWN_TRAP":
{
if (!npc.isInCombat())
if ((npc != null) && npc.isSpawned() && !npc.isInCombat())
{
npc.doCast(TRAP_SETUP.getSkill());
final Npc trap = addSpawn((getRandom(10) < 5) ? GENESIS_TRAP_1 : GENESIS_TRAP_2, npc, true, 90000, false);

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java vendored
View File

@ -54,7 +54,7 @@ public class GardenWatchman extends AbstractNpcAI
{
case "SPAWN_TRAP":
{
if (!npc.isInCombat())
if ((npc != null) && npc.isSpawned() && !npc.isInCombat())
{
npc.doCast(TRAP_SETUP.getSkill());
final Npc trap = addSpawn((getRandom(10) < 5) ? GENESIS_TRAP_1 : GENESIS_TRAP_2, npc, true, 90000, false);

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java vendored
View File

@ -54,7 +54,7 @@ public class GardenWatchman extends AbstractNpcAI
{
case "SPAWN_TRAP":
{
if (!npc.isInCombat())
if ((npc != null) && npc.isSpawned() && !npc.isInCombat())
{
npc.doCast(TRAP_SETUP.getSkill());
final Npc trap = addSpawn((getRandom(10) < 5) ? GENESIS_TRAP_1 : GENESIS_TRAP_2, npc, true, 90000, false);

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java vendored
View File

@ -54,7 +54,7 @@ public class GardenWatchman extends AbstractNpcAI
{
case "SPAWN_TRAP":
{
if (!npc.isInCombat())
if ((npc != null) && npc.isSpawned() && !npc.isInCombat())
{
npc.doCast(TRAP_SETUP.getSkill());
final Npc trap = addSpawn((getRandom(10) < 5) ? GENESIS_TRAP_1 : GENESIS_TRAP_2, npc, true, 90000, false);

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java vendored
View File

@ -54,7 +54,7 @@ public class GardenWatchman extends AbstractNpcAI
{
case "SPAWN_TRAP":
{
if (!npc.isInCombat())
if ((npc != null) && npc.isSpawned() && !npc.isInCombat())
{
npc.doCast(TRAP_SETUP.getSkill());
final Npc trap = addSpawn((getRandom(10) < 5) ? GENESIS_TRAP_1 : GENESIS_TRAP_2, npc, true, 90000, false);

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java vendored
View File

@ -54,7 +54,7 @@ public class GardenWatchman extends AbstractNpcAI
{
case "SPAWN_TRAP":
{
if (!npc.isInCombat())
if ((npc != null) && npc.isSpawned() && !npc.isInCombat())
{
npc.doCast(TRAP_SETUP.getSkill());
final Npc trap = addSpawn((getRandom(10) < 5) ? GENESIS_TRAP_1 : GENESIS_TRAP_2, npc, true, 90000, false);

2
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java vendored
View File

@ -54,7 +54,7 @@ public class GardenWatchman extends AbstractNpcAI
{
case "SPAWN_TRAP":
{
if (!npc.isInCombat())
if ((npc != null) && npc.isSpawned() && !npc.isInCombat())
{
npc.doCast(TRAP_SETUP.getSkill());
final Npc trap = addSpawn((getRandom(10) < 5) ? GENESIS_TRAP_1 : GENESIS_TRAP_2, npc, true, 90000, false);