From 2769582f88117927d148d8a01a7a238ea50a698d Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 2 Nov 2019 16:48:59 +0000
Subject: [PATCH] Fixed disabled manor system NPE. Contributed by Sahar.

---
 .../gameserver/instancemanager/CastleManorManager.java       | 5 +++++
 .../gameserver/instancemanager/CastleManorManager.java       | 5 +++++
 .../gameserver/instancemanager/CastleManorManager.java       | 5 +++++
 .../gameserver/instancemanager/CastleManorManager.java       | 5 +++++
 .../gameserver/instancemanager/CastleManorManager.java       | 5 +++++
 .../gameserver/instancemanager/CastleManorManager.java       | 5 +++++
 .../gameserver/instancemanager/CastleManorManager.java       | 5 +++++
 .../gameserver/instancemanager/CastleManorManager.java       | 5 +++++
 .../gameserver/instancemanager/CastleManorManager.java       | 5 +++++
 .../gameserver/instancemanager/CastleManorManager.java       | 5 +++++
 .../gameserver/instancemanager/CastleManorManager.java       | 5 +++++
 .../gameserver/instancemanager/CastleManorManager.java       | 5 +++++
 .../gameserver/instancemanager/CastleManorManager.java       | 5 +++++
 .../gameserver/instancemanager/CastleManorManager.java       | 5 +++++
 .../gameserver/instancemanager/CastleManorManager.java       | 5 +++++
 .../gameserver/instancemanager/CastleManorManager.java       | 5 +++++
 .../gameserver/instancemanager/CastleManorManager.java       | 5 +++++
 17 files changed, 85 insertions(+)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index b8ee5a9b44..ddc3ea7cd7 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -690,6 +690,11 @@ public class CastleManorManager implements IXmlReader, IStorable
 	
 	public void resetManorData(int castleId)
 	{
+		if (!Config.ALLOW_MANOR)
+		{
+			return;
+		}
+		
 		_procure.get(castleId).clear();
 		_procureNext.get(castleId).clear();
 		_production.get(castleId).clear();
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index b8ee5a9b44..ddc3ea7cd7 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -690,6 +690,11 @@ public class CastleManorManager implements IXmlReader, IStorable
 	
 	public void resetManorData(int castleId)
 	{
+		if (!Config.ALLOW_MANOR)
+		{
+			return;
+		}
+		
 		_procure.get(castleId).clear();
 		_procureNext.get(castleId).clear();
 		_production.get(castleId).clear();
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index b8ee5a9b44..ddc3ea7cd7 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -690,6 +690,11 @@ public class CastleManorManager implements IXmlReader, IStorable
 	
 	public void resetManorData(int castleId)
 	{
+		if (!Config.ALLOW_MANOR)
+		{
+			return;
+		}
+		
 		_procure.get(castleId).clear();
 		_procureNext.get(castleId).clear();
 		_production.get(castleId).clear();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index b8ee5a9b44..ddc3ea7cd7 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -690,6 +690,11 @@ public class CastleManorManager implements IXmlReader, IStorable
 	
 	public void resetManorData(int castleId)
 	{
+		if (!Config.ALLOW_MANOR)
+		{
+			return;
+		}
+		
 		_procure.get(castleId).clear();
 		_procureNext.get(castleId).clear();
 		_production.get(castleId).clear();
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index b8ee5a9b44..ddc3ea7cd7 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -690,6 +690,11 @@ public class CastleManorManager implements IXmlReader, IStorable
 	
 	public void resetManorData(int castleId)
 	{
+		if (!Config.ALLOW_MANOR)
+		{
+			return;
+		}
+		
 		_procure.get(castleId).clear();
 		_procureNext.get(castleId).clear();
 		_production.get(castleId).clear();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index b8ee5a9b44..ddc3ea7cd7 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -690,6 +690,11 @@ public class CastleManorManager implements IXmlReader, IStorable
 	
 	public void resetManorData(int castleId)
 	{
+		if (!Config.ALLOW_MANOR)
+		{
+			return;
+		}
+		
 		_procure.get(castleId).clear();
 		_procureNext.get(castleId).clear();
 		_production.get(castleId).clear();
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index b8ee5a9b44..ddc3ea7cd7 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -690,6 +690,11 @@ public class CastleManorManager implements IXmlReader, IStorable
 	
 	public void resetManorData(int castleId)
 	{
+		if (!Config.ALLOW_MANOR)
+		{
+			return;
+		}
+		
 		_procure.get(castleId).clear();
 		_procureNext.get(castleId).clear();
 		_production.get(castleId).clear();
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index b8ee5a9b44..ddc3ea7cd7 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -690,6 +690,11 @@ public class CastleManorManager implements IXmlReader, IStorable
 	
 	public void resetManorData(int castleId)
 	{
+		if (!Config.ALLOW_MANOR)
+		{
+			return;
+		}
+		
 		_procure.get(castleId).clear();
 		_procureNext.get(castleId).clear();
 		_production.get(castleId).clear();
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index 0ddb1f80e1..261bb008c1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -686,6 +686,11 @@ public class CastleManorManager implements IXmlReader, IStorable
 	
 	public void resetManorData(int castleId)
 	{
+		if (!Config.ALLOW_MANOR)
+		{
+			return;
+		}
+		
 		_procure.get(castleId).clear();
 		_procureNext.get(castleId).clear();
 		_production.get(castleId).clear();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index 0ddb1f80e1..261bb008c1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -686,6 +686,11 @@ public class CastleManorManager implements IXmlReader, IStorable
 	
 	public void resetManorData(int castleId)
 	{
+		if (!Config.ALLOW_MANOR)
+		{
+			return;
+		}
+		
 		_procure.get(castleId).clear();
 		_procureNext.get(castleId).clear();
 		_production.get(castleId).clear();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index b8ee5a9b44..ddc3ea7cd7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -690,6 +690,11 @@ public class CastleManorManager implements IXmlReader, IStorable
 	
 	public void resetManorData(int castleId)
 	{
+		if (!Config.ALLOW_MANOR)
+		{
+			return;
+		}
+		
 		_procure.get(castleId).clear();
 		_procureNext.get(castleId).clear();
 		_production.get(castleId).clear();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index b8ee5a9b44..ddc3ea7cd7 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -690,6 +690,11 @@ public class CastleManorManager implements IXmlReader, IStorable
 	
 	public void resetManorData(int castleId)
 	{
+		if (!Config.ALLOW_MANOR)
+		{
+			return;
+		}
+		
 		_procure.get(castleId).clear();
 		_procureNext.get(castleId).clear();
 		_production.get(castleId).clear();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index b8ee5a9b44..ddc3ea7cd7 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -690,6 +690,11 @@ public class CastleManorManager implements IXmlReader, IStorable
 	
 	public void resetManorData(int castleId)
 	{
+		if (!Config.ALLOW_MANOR)
+		{
+			return;
+		}
+		
 		_procure.get(castleId).clear();
 		_procureNext.get(castleId).clear();
 		_production.get(castleId).clear();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index b8ee5a9b44..ddc3ea7cd7 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -690,6 +690,11 @@ public class CastleManorManager implements IXmlReader, IStorable
 	
 	public void resetManorData(int castleId)
 	{
+		if (!Config.ALLOW_MANOR)
+		{
+			return;
+		}
+		
 		_procure.get(castleId).clear();
 		_procureNext.get(castleId).clear();
 		_production.get(castleId).clear();
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index b8ee5a9b44..ddc3ea7cd7 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -690,6 +690,11 @@ public class CastleManorManager implements IXmlReader, IStorable
 	
 	public void resetManorData(int castleId)
 	{
+		if (!Config.ALLOW_MANOR)
+		{
+			return;
+		}
+		
 		_procure.get(castleId).clear();
 		_procureNext.get(castleId).clear();
 		_production.get(castleId).clear();
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index b8ee5a9b44..ddc3ea7cd7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -690,6 +690,11 @@ public class CastleManorManager implements IXmlReader, IStorable
 	
 	public void resetManorData(int castleId)
 	{
+		if (!Config.ALLOW_MANOR)
+		{
+			return;
+		}
+		
 		_procure.get(castleId).clear();
 		_procureNext.get(castleId).clear();
 		_production.get(castleId).clear();
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index b8ee5a9b44..ddc3ea7cd7 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -690,6 +690,11 @@ public class CastleManorManager implements IXmlReader, IStorable
 	
 	public void resetManorData(int castleId)
 	{
+		if (!Config.ALLOW_MANOR)
+		{
+			return;
+		}
+		
 		_procure.get(castleId).clear();
 		_procureNext.get(castleId).clear();
 		_production.get(castleId).clear();