lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better logs for null region check.

Browse Source
This commit is contained in:
MobiusDev
2018-04-13 14:45:30 +00:00
parent 0807932e6d
commit badc4d0186
7 changed files with 56 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -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);
}
}
}