From bc3f982d7bb9b52f2632a2f6fb6aff20ec9c5fe3 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 4 Sep 2018 02:42:50 +0000
Subject: [PATCH] Avoid FenceData NPE.

---
 .../java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java | 3 ++-
 .../java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java | 3 ++-
 .../java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java | 3 ++-
 .../java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java | 3 ++-
 .../java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java | 3 ++-
 .../java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java | 3 ++-
 .../java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java | 3 ++-
 .../java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java | 3 ++-
 8 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index 1dd89e44b9..7ef186ee29 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -184,7 +184,8 @@ public final class FenceData implements IGameXmlReader
 			return false;
 		};
 		
-		return _regions.getOrDefault(L2World.getInstance().getRegion(x, y, z), Collections.emptyList()).stream().anyMatch(filter);
+		final L2WorldRegion region = L2World.getInstance().getRegion(x, y, z); // FIXME: Should not be null.
+		return region == null ? false : _regions.getOrDefault(region, Collections.emptyList()).stream().anyMatch(filter);
 	}
 	
 	private boolean crossLinePart(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double xMin, double yMin, double xMax, double yMax)
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index 1dd89e44b9..7ef186ee29 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -184,7 +184,8 @@ public final class FenceData implements IGameXmlReader
 			return false;
 		};
 		
-		return _regions.getOrDefault(L2World.getInstance().getRegion(x, y, z), Collections.emptyList()).stream().anyMatch(filter);
+		final L2WorldRegion region = L2World.getInstance().getRegion(x, y, z); // FIXME: Should not be null.
+		return region == null ? false : _regions.getOrDefault(region, Collections.emptyList()).stream().anyMatch(filter);
 	}
 	
 	private boolean crossLinePart(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double xMin, double yMin, double xMax, double yMax)
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index 1dd89e44b9..7ef186ee29 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -184,7 +184,8 @@ public final class FenceData implements IGameXmlReader
 			return false;
 		};
 		
-		return _regions.getOrDefault(L2World.getInstance().getRegion(x, y, z), Collections.emptyList()).stream().anyMatch(filter);
+		final L2WorldRegion region = L2World.getInstance().getRegion(x, y, z); // FIXME: Should not be null.
+		return region == null ? false : _regions.getOrDefault(region, Collections.emptyList()).stream().anyMatch(filter);
 	}
 	
 	private boolean crossLinePart(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double xMin, double yMin, double xMax, double yMax)
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index 1dd89e44b9..7ef186ee29 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -184,7 +184,8 @@ public final class FenceData implements IGameXmlReader
 			return false;
 		};
 		
-		return _regions.getOrDefault(L2World.getInstance().getRegion(x, y, z), Collections.emptyList()).stream().anyMatch(filter);
+		final L2WorldRegion region = L2World.getInstance().getRegion(x, y, z); // FIXME: Should not be null.
+		return region == null ? false : _regions.getOrDefault(region, Collections.emptyList()).stream().anyMatch(filter);
 	}
 	
 	private boolean crossLinePart(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double xMin, double yMin, double xMax, double yMax)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index 19cf61e60a..b7a68ad605 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -182,7 +182,8 @@ public final class FenceData implements IGameXmlReader
 			return false;
 		};
 		
-		return _regions.getOrDefault(L2World.getInstance().getRegion(x, y, z), Collections.emptyList()).stream().anyMatch(filter);
+		final L2WorldRegion region = L2World.getInstance().getRegion(x, y, z); // FIXME: Should not be null.
+		return region == null ? false : _regions.getOrDefault(region, Collections.emptyList()).stream().anyMatch(filter);
 	}
 	
 	private boolean crossLinePart(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double xMin, double yMin, double xMax, double yMax)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index 1dd89e44b9..7ef186ee29 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -184,7 +184,8 @@ public final class FenceData implements IGameXmlReader
 			return false;
 		};
 		
-		return _regions.getOrDefault(L2World.getInstance().getRegion(x, y, z), Collections.emptyList()).stream().anyMatch(filter);
+		final L2WorldRegion region = L2World.getInstance().getRegion(x, y, z); // FIXME: Should not be null.
+		return region == null ? false : _regions.getOrDefault(region, Collections.emptyList()).stream().anyMatch(filter);
 	}
 	
 	private boolean crossLinePart(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double xMin, double yMin, double xMax, double yMax)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index 1dd89e44b9..7ef186ee29 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -184,7 +184,8 @@ public final class FenceData implements IGameXmlReader
 			return false;
 		};
 		
-		return _regions.getOrDefault(L2World.getInstance().getRegion(x, y, z), Collections.emptyList()).stream().anyMatch(filter);
+		final L2WorldRegion region = L2World.getInstance().getRegion(x, y, z); // FIXME: Should not be null.
+		return region == null ? false : _regions.getOrDefault(region, Collections.emptyList()).stream().anyMatch(filter);
 	}
 	
 	private boolean crossLinePart(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double xMin, double yMin, double xMax, double yMax)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index 1dd89e44b9..7ef186ee29 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -184,7 +184,8 @@ public final class FenceData implements IGameXmlReader
 			return false;
 		};
 		
-		return _regions.getOrDefault(L2World.getInstance().getRegion(x, y, z), Collections.emptyList()).stream().anyMatch(filter);
+		final L2WorldRegion region = L2World.getInstance().getRegion(x, y, z); // FIXME: Should not be null.
+		return region == null ? false : _regions.getOrDefault(region, Collections.emptyList()).stream().anyMatch(filter);
 	}
 	
 	private boolean crossLinePart(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double xMin, double yMin, double xMax, double yMax)