From d8021624a1b82127cceed7cbb5eb74d77c4ef4c9 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 29 Mar 2020 08:13:37 +0000
Subject: [PATCH] Additional player NPE checks for Dimensional Wrap.

---
 .../DimensionalWrap/DimensionalWrap.java         | 16 ++++++++++++++++
 .../DimensionalWrap/DimensionalWrap.java         | 16 ++++++++++++++++
 .../DimensionalWrap/DimensionalWrap.java         | 16 ++++++++++++++++
 .../DimensionalWrap/DimensionalWrap.java         | 16 ++++++++++++++++
 .../DimensionalWrap/DimensionalWrap.java         | 16 ++++++++++++++++
 .../DimensionalWrap/DimensionalWrap.java         | 16 ++++++++++++++++
 .../DimensionalWrap/DimensionalWrap.java         | 16 ++++++++++++++++
 .../DimensionalWrap/DimensionalWrap.java         | 16 ++++++++++++++++
 8 files changed, 128 insertions(+)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index 21a920dcf3..4be98f5b35 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -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))
 				{
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index 21a920dcf3..4be98f5b35 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -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))
 				{
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index 21a920dcf3..4be98f5b35 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -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))
 				{
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index 21a920dcf3..4be98f5b35 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -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))
 				{
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index 74440b4ffe..bfddfc60b4 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -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))
 				{
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index 74440b4ffe..bfddfc60b4 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -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))
 				{
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index 21a920dcf3..4be98f5b35 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -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))
 				{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index 8d2c1e5296..4ff7b656c8 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -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))
 				{