From badc4d018690077e4bfdacd77941ff491764b6bc Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 13 Apr 2018 14:45:30 +0000
Subject: [PATCH] Better logs for null region check.

---
 .../gameserver/model/actor/L2Character.java   | 26 ++++++-------------
 .../gameserver/model/actor/L2Character.java   | 26 ++++++-------------
 .../gameserver/model/actor/L2Character.java   | 26 ++++++-------------
 .../gameserver/model/actor/L2Character.java   | 26 ++++++-------------
 .../gameserver/model/actor/L2Character.java   | 26 ++++++-------------
 .../gameserver/model/actor/L2Character.java   | 26 ++++++-------------
 .../gameserver/model/actor/L2Character.java   | 26 ++++++-------------
 7 files changed, 56 insertions(+), 126 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 48eb4a9a83..3574d7318d 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -65,7 +65,6 @@ import com.l2jmobius.gameserver.idfactory.IdFactory;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.instancemanager.QuestManager;
 import com.l2jmobius.gameserver.instancemanager.TimersManager;
-import com.l2jmobius.gameserver.instancemanager.WalkingManager;
 import com.l2jmobius.gameserver.instancemanager.ZoneManager;
 import com.l2jmobius.gameserver.model.CharEffectList;
 import com.l2jmobius.gameserver.model.CreatureContainer;
@@ -543,7 +542,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	public void onDecay()
 	{
 		decayMe();
-		ZoneManager.getInstance().getRegion(this).removeFromZones(this);
+		final ZoneRegion region = ZoneManager.getInstance().getRegion(this);
+		if (region != null)
+		{
+			region.removeFromZones(this);
+		}
 		
 		// Removes itself from the summoned list.
 		if ((getSummoner() != null))
@@ -3030,30 +3033,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			{
 				final L2Npc npc = (L2Npc) this;
 				LOGGER.warning("Deleting npc " + getName() + " NPCID[" + npc.getId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
-				deleteMe();
-				WalkingManager.getInstance().onDeath(npc);
-				final L2Character summoner = getSummoner();
-				if ((summoner != null) && summoner.isNpc())
-				{
-					((L2Npc) summoner).removeSummonedNpc(getObjectId());
-				}
 				final L2Spawn spawn = npc.getSpawn();
-				if ((spawn != null) && spawn.isRespawnEnabled())
+				if (spawn != null)
 				{
-					spawn.decreaseCount(npc);
+					LOGGER.warning("Spawn location X:" + spawn.getX() + " Y:" + spawn.getY() + " Z:" + spawn.getZ() + " Heading:" + spawn.getHeading());
 				}
-				final Instance instance = getInstanceWorld();
-				if (instance != null)
-				{
-					instance.removeNpc(npc);
-				}
-				L2World.getInstance().removeObject(this);
+				deleteMe();
 			}
 			else
 			{
 				LOGGER.warning("Deleting object " + getName() + " OID[" + getObjectId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
 				deleteMe();
-				L2World.getInstance().removeObject(this);
 			}
 		}
 	}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 48eb4a9a83..3574d7318d 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -65,7 +65,6 @@ import com.l2jmobius.gameserver.idfactory.IdFactory;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.instancemanager.QuestManager;
 import com.l2jmobius.gameserver.instancemanager.TimersManager;
-import com.l2jmobius.gameserver.instancemanager.WalkingManager;
 import com.l2jmobius.gameserver.instancemanager.ZoneManager;
 import com.l2jmobius.gameserver.model.CharEffectList;
 import com.l2jmobius.gameserver.model.CreatureContainer;
@@ -543,7 +542,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	public void onDecay()
 	{
 		decayMe();
-		ZoneManager.getInstance().getRegion(this).removeFromZones(this);
+		final ZoneRegion region = ZoneManager.getInstance().getRegion(this);
+		if (region != null)
+		{
+			region.removeFromZones(this);
+		}
 		
 		// Removes itself from the summoned list.
 		if ((getSummoner() != null))
@@ -3030,30 +3033,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			{
 				final L2Npc npc = (L2Npc) this;
 				LOGGER.warning("Deleting npc " + getName() + " NPCID[" + npc.getId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
-				deleteMe();
-				WalkingManager.getInstance().onDeath(npc);
-				final L2Character summoner = getSummoner();
-				if ((summoner != null) && summoner.isNpc())
-				{
-					((L2Npc) summoner).removeSummonedNpc(getObjectId());
-				}
 				final L2Spawn spawn = npc.getSpawn();
-				if ((spawn != null) && spawn.isRespawnEnabled())
+				if (spawn != null)
 				{
-					spawn.decreaseCount(npc);
+					LOGGER.warning("Spawn location X:" + spawn.getX() + " Y:" + spawn.getY() + " Z:" + spawn.getZ() + " Heading:" + spawn.getHeading());
 				}
-				final Instance instance = getInstanceWorld();
-				if (instance != null)
-				{
-					instance.removeNpc(npc);
-				}
-				L2World.getInstance().removeObject(this);
+				deleteMe();
 			}
 			else
 			{
 				LOGGER.warning("Deleting object " + getName() + " OID[" + getObjectId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
 				deleteMe();
-				L2World.getInstance().removeObject(this);
 			}
 		}
 	}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 48eb4a9a83..3574d7318d 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -65,7 +65,6 @@ import com.l2jmobius.gameserver.idfactory.IdFactory;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.instancemanager.QuestManager;
 import com.l2jmobius.gameserver.instancemanager.TimersManager;
-import com.l2jmobius.gameserver.instancemanager.WalkingManager;
 import com.l2jmobius.gameserver.instancemanager.ZoneManager;
 import com.l2jmobius.gameserver.model.CharEffectList;
 import com.l2jmobius.gameserver.model.CreatureContainer;
@@ -543,7 +542,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	public void onDecay()
 	{
 		decayMe();
-		ZoneManager.getInstance().getRegion(this).removeFromZones(this);
+		final ZoneRegion region = ZoneManager.getInstance().getRegion(this);
+		if (region != null)
+		{
+			region.removeFromZones(this);
+		}
 		
 		// Removes itself from the summoned list.
 		if ((getSummoner() != null))
@@ -3030,30 +3033,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			{
 				final L2Npc npc = (L2Npc) this;
 				LOGGER.warning("Deleting npc " + getName() + " NPCID[" + npc.getId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
-				deleteMe();
-				WalkingManager.getInstance().onDeath(npc);
-				final L2Character summoner = getSummoner();
-				if ((summoner != null) && summoner.isNpc())
-				{
-					((L2Npc) summoner).removeSummonedNpc(getObjectId());
-				}
 				final L2Spawn spawn = npc.getSpawn();
-				if ((spawn != null) && spawn.isRespawnEnabled())
+				if (spawn != null)
 				{
-					spawn.decreaseCount(npc);
+					LOGGER.warning("Spawn location X:" + spawn.getX() + " Y:" + spawn.getY() + " Z:" + spawn.getZ() + " Heading:" + spawn.getHeading());
 				}
-				final Instance instance = getInstanceWorld();
-				if (instance != null)
-				{
-					instance.removeNpc(npc);
-				}
-				L2World.getInstance().removeObject(this);
+				deleteMe();
 			}
 			else
 			{
 				LOGGER.warning("Deleting object " + getName() + " OID[" + getObjectId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
 				deleteMe();
-				L2World.getInstance().removeObject(this);
 			}
 		}
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 48eb4a9a83..3574d7318d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -65,7 +65,6 @@ import com.l2jmobius.gameserver.idfactory.IdFactory;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.instancemanager.QuestManager;
 import com.l2jmobius.gameserver.instancemanager.TimersManager;
-import com.l2jmobius.gameserver.instancemanager.WalkingManager;
 import com.l2jmobius.gameserver.instancemanager.ZoneManager;
 import com.l2jmobius.gameserver.model.CharEffectList;
 import com.l2jmobius.gameserver.model.CreatureContainer;
@@ -543,7 +542,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	public void onDecay()
 	{
 		decayMe();
-		ZoneManager.getInstance().getRegion(this).removeFromZones(this);
+		final ZoneRegion region = ZoneManager.getInstance().getRegion(this);
+		if (region != null)
+		{
+			region.removeFromZones(this);
+		}
 		
 		// Removes itself from the summoned list.
 		if ((getSummoner() != null))
@@ -3030,30 +3033,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			{
 				final L2Npc npc = (L2Npc) this;
 				LOGGER.warning("Deleting npc " + getName() + " NPCID[" + npc.getId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
-				deleteMe();
-				WalkingManager.getInstance().onDeath(npc);
-				final L2Character summoner = getSummoner();
-				if ((summoner != null) && summoner.isNpc())
-				{
-					((L2Npc) summoner).removeSummonedNpc(getObjectId());
-				}
 				final L2Spawn spawn = npc.getSpawn();
-				if ((spawn != null) && spawn.isRespawnEnabled())
+				if (spawn != null)
 				{
-					spawn.decreaseCount(npc);
+					LOGGER.warning("Spawn location X:" + spawn.getX() + " Y:" + spawn.getY() + " Z:" + spawn.getZ() + " Heading:" + spawn.getHeading());
 				}
-				final Instance instance = getInstanceWorld();
-				if (instance != null)
-				{
-					instance.removeNpc(npc);
-				}
-				L2World.getInstance().removeObject(this);
+				deleteMe();
 			}
 			else
 			{
 				LOGGER.warning("Deleting object " + getName() + " OID[" + getObjectId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
 				deleteMe();
-				L2World.getInstance().removeObject(this);
 			}
 		}
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index e4e0fa172c..5816ebbd1c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -57,7 +57,6 @@ import com.l2jmobius.gameserver.instancemanager.InstanceManager;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.instancemanager.QuestManager;
 import com.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
-import com.l2jmobius.gameserver.instancemanager.WalkingManager;
 import com.l2jmobius.gameserver.instancemanager.ZoneManager;
 import com.l2jmobius.gameserver.model.CharEffectList;
 import com.l2jmobius.gameserver.model.L2AccessLevel;
@@ -495,7 +494,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	public void onDecay()
 	{
 		decayMe();
-		ZoneManager.getInstance().getRegion(this).removeFromZones(this);
+		final ZoneRegion region = ZoneManager.getInstance().getRegion(this);
+		if (region != null)
+		{
+			region.removeFromZones(this);
+		}
 	}
 	
 	@Override
@@ -4052,30 +4055,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			{
 				final L2Npc npc = (L2Npc) this;
 				LOGGER.warning("Deleting npc " + getName() + " NPCID[" + npc.getId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
-				deleteMe();
-				WalkingManager.getInstance().onDeath(npc);
-				final L2Character summoner = getSummoner();
-				if ((summoner != null) && summoner.isNpc())
-				{
-					((L2Npc) summoner).removeSummonedNpc(getObjectId());
-				}
 				final L2Spawn spawn = npc.getSpawn();
-				if ((spawn != null) && spawn.isRespawnEnabled())
+				if (spawn != null)
 				{
-					spawn.decreaseCount(npc);
+					LOGGER.warning("Spawn location X:" + spawn.getX() + " Y:" + spawn.getY() + " Z:" + spawn.getZ() + " Heading:" + spawn.getHeading());
 				}
-				final Instance instance = InstanceManager.getInstance().getInstance(getInstanceId());
-				if (instance != null)
-				{
-					instance.removeNpc(npc);
-				}
-				L2World.getInstance().removeObject(this);
+				deleteMe();
 			}
 			else
 			{
 				LOGGER.warning("Deleting object " + getName() + " OID[" + getObjectId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
 				deleteMe();
-				L2World.getInstance().removeObject(this);
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 48eb4a9a83..3574d7318d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -65,7 +65,6 @@ import com.l2jmobius.gameserver.idfactory.IdFactory;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.instancemanager.QuestManager;
 import com.l2jmobius.gameserver.instancemanager.TimersManager;
-import com.l2jmobius.gameserver.instancemanager.WalkingManager;
 import com.l2jmobius.gameserver.instancemanager.ZoneManager;
 import com.l2jmobius.gameserver.model.CharEffectList;
 import com.l2jmobius.gameserver.model.CreatureContainer;
@@ -543,7 +542,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	public void onDecay()
 	{
 		decayMe();
-		ZoneManager.getInstance().getRegion(this).removeFromZones(this);
+		final ZoneRegion region = ZoneManager.getInstance().getRegion(this);
+		if (region != null)
+		{
+			region.removeFromZones(this);
+		}
 		
 		// Removes itself from the summoned list.
 		if ((getSummoner() != null))
@@ -3030,30 +3033,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			{
 				final L2Npc npc = (L2Npc) this;
 				LOGGER.warning("Deleting npc " + getName() + " NPCID[" + npc.getId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
-				deleteMe();
-				WalkingManager.getInstance().onDeath(npc);
-				final L2Character summoner = getSummoner();
-				if ((summoner != null) && summoner.isNpc())
-				{
-					((L2Npc) summoner).removeSummonedNpc(getObjectId());
-				}
 				final L2Spawn spawn = npc.getSpawn();
-				if ((spawn != null) && spawn.isRespawnEnabled())
+				if (spawn != null)
 				{
-					spawn.decreaseCount(npc);
+					LOGGER.warning("Spawn location X:" + spawn.getX() + " Y:" + spawn.getY() + " Z:" + spawn.getZ() + " Heading:" + spawn.getHeading());
 				}
-				final Instance instance = getInstanceWorld();
-				if (instance != null)
-				{
-					instance.removeNpc(npc);
-				}
-				L2World.getInstance().removeObject(this);
+				deleteMe();
 			}
 			else
 			{
 				LOGGER.warning("Deleting object " + getName() + " OID[" + getObjectId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
 				deleteMe();
-				L2World.getInstance().removeObject(this);
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 48eb4a9a83..3574d7318d 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -65,7 +65,6 @@ import com.l2jmobius.gameserver.idfactory.IdFactory;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.instancemanager.QuestManager;
 import com.l2jmobius.gameserver.instancemanager.TimersManager;
-import com.l2jmobius.gameserver.instancemanager.WalkingManager;
 import com.l2jmobius.gameserver.instancemanager.ZoneManager;
 import com.l2jmobius.gameserver.model.CharEffectList;
 import com.l2jmobius.gameserver.model.CreatureContainer;
@@ -543,7 +542,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	public void onDecay()
 	{
 		decayMe();
-		ZoneManager.getInstance().getRegion(this).removeFromZones(this);
+		final ZoneRegion region = ZoneManager.getInstance().getRegion(this);
+		if (region != null)
+		{
+			region.removeFromZones(this);
+		}
 		
 		// Removes itself from the summoned list.
 		if ((getSummoner() != null))
@@ -3030,30 +3033,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			{
 				final L2Npc npc = (L2Npc) this;
 				LOGGER.warning("Deleting npc " + getName() + " NPCID[" + npc.getId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
-				deleteMe();
-				WalkingManager.getInstance().onDeath(npc);
-				final L2Character summoner = getSummoner();
-				if ((summoner != null) && summoner.isNpc())
-				{
-					((L2Npc) summoner).removeSummonedNpc(getObjectId());
-				}
 				final L2Spawn spawn = npc.getSpawn();
-				if ((spawn != null) && spawn.isRespawnEnabled())
+				if (spawn != null)
 				{
-					spawn.decreaseCount(npc);
+					LOGGER.warning("Spawn location X:" + spawn.getX() + " Y:" + spawn.getY() + " Z:" + spawn.getZ() + " Heading:" + spawn.getHeading());
 				}
-				final Instance instance = getInstanceWorld();
-				if (instance != null)
-				{
-					instance.removeNpc(npc);
-				}
-				L2World.getInstance().removeObject(this);
+				deleteMe();
 			}
 			else
 			{
 				LOGGER.warning("Deleting object " + getName() + " OID[" + getObjectId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
 				deleteMe();
-				L2World.getInstance().removeObject(this);
 			}
 		}
 	}