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

Additional player NPE checks for Dimensional Wrap.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-03-29 08:13:37 +00:00
parent 1a6d4a7fcb
commit d8021624a1
8 changed files with 128 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java vendored
View File

@@ -509,6 +509,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "START_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -522,6 +526,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "FIRST_SPAWN":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -608,6 +616,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "SWITCH_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -628,6 +640,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "NEXT_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{

16
L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java vendored
View File

@@ -509,6 +509,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "START_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -522,6 +526,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "FIRST_SPAWN":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -608,6 +616,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "SWITCH_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -628,6 +640,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "NEXT_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{

16
L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java vendored
View File

@@ -509,6 +509,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "START_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -522,6 +526,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "FIRST_SPAWN":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -608,6 +616,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "SWITCH_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -628,6 +640,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "NEXT_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{

16
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java vendored
View File

@@ -509,6 +509,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "START_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -522,6 +526,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "FIRST_SPAWN":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -608,6 +616,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "SWITCH_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -628,6 +640,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "NEXT_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{

16
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java vendored
View File

@@ -509,6 +509,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "START_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -522,6 +526,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "FIRST_SPAWN":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -608,6 +616,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "SWITCH_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -628,6 +640,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "NEXT_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{

16
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java vendored
View File

@@ -509,6 +509,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "START_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -522,6 +526,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "FIRST_SPAWN":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -608,6 +616,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "SWITCH_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -628,6 +640,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "NEXT_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{

16
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java vendored
View File

@@ -509,6 +509,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "START_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -522,6 +526,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "FIRST_SPAWN":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -608,6 +616,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "SWITCH_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -628,6 +640,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "NEXT_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{

16
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java vendored
View File

@@ -509,6 +509,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "START_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -522,6 +526,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "FIRST_SPAWN":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -608,6 +616,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "SWITCH_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{
@@ -628,6 +640,10 @@ public class DimensionalWrap extends AbstractInstance
}
case "NEXT_STAGE":
{
if (player == null)
{
return null;
}
final Instance world = player.getInstanceWorld();
if (!isInInstance(world))
{