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

Fixed probable Parade NPE.

Browse Source
This commit is contained in:
MobiusDev
2018-04-23 12:51:55 +00:00
parent e95c422e70
commit 4a32f63be7
5 changed files with 95 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java vendored
View File

@@ -145,7 +145,13 @@ public final class Parade extends AbstractNpcAI
void clean() void clean()
{ {
spawns.forEach(L2Npc::deleteMe); for (L2Npc spawn : spawns)
{
if (spawn != null)
{
spawn.deleteMe();
}
}
spawns.clear(); spawns.clear();
} }
@@ -239,9 +245,18 @@ public final class Parade extends AbstractNpcAI
@Override @Override
public void run() public void run()
{ {
spawnTask.cancel(true); if (spawnTask != null)
deleteTask.cancel(true); {
cleanTask.cancel(true); spawnTask.cancel(true);
}
if (deleteTask != null)
{
deleteTask.cancel(true);
}
if (cleanTask != null)
{
cleanTask.cancel(true);
}
clean(); clean();
} }
} }

23
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java vendored
View File

@@ -145,7 +145,13 @@ public final class Parade extends AbstractNpcAI
void clean() void clean()
{ {
spawns.forEach(L2Npc::deleteMe); for (L2Npc spawn : spawns)
{
if (spawn != null)
{
spawn.deleteMe();
}
}
spawns.clear(); spawns.clear();
} }
@@ -239,9 +245,18 @@ public final class Parade extends AbstractNpcAI
@Override @Override
public void run() public void run()
{ {
spawnTask.cancel(true); if (spawnTask != null)
deleteTask.cancel(true); {
cleanTask.cancel(true); spawnTask.cancel(true);
}
if (deleteTask != null)
{
deleteTask.cancel(true);
}
if (cleanTask != null)
{
cleanTask.cancel(true);
}
clean(); clean();
} }
} }

23
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java vendored
View File

@@ -145,7 +145,13 @@ public final class Parade extends AbstractNpcAI
void clean() void clean()
{ {
spawns.forEach(L2Npc::deleteMe); for (L2Npc spawn : spawns)
{
if (spawn != null)
{
spawn.deleteMe();
}
}
spawns.clear(); spawns.clear();
} }
@@ -239,9 +245,18 @@ public final class Parade extends AbstractNpcAI
@Override @Override
public void run() public void run()
{ {
spawnTask.cancel(true); if (spawnTask != null)
deleteTask.cancel(true); {
cleanTask.cancel(true); spawnTask.cancel(true);
}
if (deleteTask != null)
{
deleteTask.cancel(true);
}
if (cleanTask != null)
{
cleanTask.cancel(true);
}
clean(); clean();
} }
} }

23
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java vendored
View File

@@ -145,7 +145,13 @@ public final class Parade extends AbstractNpcAI
void clean() void clean()
{ {
spawns.forEach(L2Npc::deleteMe); for (L2Npc spawn : spawns)
{
if (spawn != null)
{
spawn.deleteMe();
}
}
spawns.clear(); spawns.clear();
} }
@@ -239,9 +245,18 @@ public final class Parade extends AbstractNpcAI
@Override @Override
public void run() public void run()
{ {
spawnTask.cancel(true); if (spawnTask != null)
deleteTask.cancel(true); {
cleanTask.cancel(true); spawnTask.cancel(true);
}
if (deleteTask != null)
{
deleteTask.cancel(true);
}
if (cleanTask != null)
{
cleanTask.cancel(true);
}
clean(); clean();
} }
} }

23
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java vendored
View File

@@ -145,7 +145,13 @@ public final class Parade extends AbstractNpcAI
void clean() void clean()
{ {
spawns.forEach(L2Npc::deleteMe); for (L2Npc spawn : spawns)
{
if (spawn != null)
{
spawn.deleteMe();
}
}
spawns.clear(); spawns.clear();
} }
@@ -239,9 +245,18 @@ public final class Parade extends AbstractNpcAI
@Override @Override
public void run() public void run()
{ {
spawnTask.cancel(true); if (spawnTask != null)
deleteTask.cancel(true); {
cleanTask.cancel(true); spawnTask.cancel(true);
}
if (deleteTask != null)
{
deleteTask.cancel(true);
}
if (cleanTask != null)
{
cleanTask.cancel(true);
}
clean(); clean();
} }
} }