From 28e36d17c6dbed218ecfd09ff45cfdb685ff405a Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 26 Mar 2020 11:38:12 +0000
Subject: [PATCH] Fixed probable Dimensional Warp NPE.

---
 .../scripts/instances/DimensionalWrap/DimensionalWrap.java    | 4 ++++
 .../scripts/instances/DimensionalWrap/DimensionalWrap.java    | 4 ++++
 .../scripts/instances/DimensionalWrap/DimensionalWrap.java    | 4 ++++
 .../scripts/instances/DimensionalWrap/DimensionalWrap.java    | 4 ++++
 .../scripts/instances/DimensionalWrap/DimensionalWrap.java    | 4 ++++
 .../scripts/instances/DimensionalWrap/DimensionalWrap.java    | 4 ++++
 .../scripts/instances/DimensionalWrap/DimensionalWrap.java    | 4 ++++
 .../scripts/instances/DimensionalWrap/DimensionalWrap.java    | 4 ++++
 8 files changed, 32 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 466b76006c..21a920dcf3 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
@@ -592,6 +592,10 @@ public class DimensionalWrap extends AbstractInstance
 			}
 			case "CHANGE_LOCATION":
 			{
+				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 466b76006c..21a920dcf3 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
@@ -592,6 +592,10 @@ public class DimensionalWrap extends AbstractInstance
 			}
 			case "CHANGE_LOCATION":
 			{
+				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 466b76006c..21a920dcf3 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
@@ -592,6 +592,10 @@ public class DimensionalWrap extends AbstractInstance
 			}
 			case "CHANGE_LOCATION":
 			{
+				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 466b76006c..21a920dcf3 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
@@ -592,6 +592,10 @@ public class DimensionalWrap extends AbstractInstance
 			}
 			case "CHANGE_LOCATION":
 			{
+				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 593b867277..74440b4ffe 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
@@ -592,6 +592,10 @@ public class DimensionalWrap extends AbstractInstance
 			}
 			case "CHANGE_LOCATION":
 			{
+				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 593b867277..74440b4ffe 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
@@ -592,6 +592,10 @@ public class DimensionalWrap extends AbstractInstance
 			}
 			case "CHANGE_LOCATION":
 			{
+				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 466b76006c..21a920dcf3 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
@@ -592,6 +592,10 @@ public class DimensionalWrap extends AbstractInstance
 			}
 			case "CHANGE_LOCATION":
 			{
+				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 bc97ef5763..8d2c1e5296 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
@@ -592,6 +592,10 @@ public class DimensionalWrap extends AbstractInstance
 			}
 			case "CHANGE_LOCATION":
 			{
+				if (player == null)
+				{
+					return null;
+				}
 				final Instance world = player.getInstanceWorld();
 				if (!isInInstance(world))
 				{