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

Solution for revalidateZone NPE.

Browse Source
This commit is contained in:
MobiusDev 2018-04-12 11:02:25 +00:00
parent 2da9634c37
commit dec98c7049
7 changed files with 189 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -81,6 +81,7 @@ import com.l2jmobius.gameserver.model.TeleportWhereType;
import com.l2jmobius.gameserver.model.TimeStamp;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2TrapInstance;
import com.l2jmobius.gameserver.model.actor.stat.CharStat;
import com.l2jmobius.gameserver.model.actor.status.CharStatus;
@ -3007,7 +3008,32 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
ZoneManager.getInstance().getRegion(this).revalidateZones(this);
final ZoneRegion region = ZoneManager.getInstance().getRegion(this);
if (region != null)
{
region.revalidateZones(this);
}
else // Precaution. Moved at invalid region?
{
if (isPlayer())
{
stopMove(((L2PcInstance) this).getLastServerPosition());
}
else if (isServitor())
{
((L2ServitorInstance) this).unSummon(((L2ServitorInstance) this).getOwner());
}
else if (isNpc())
{
LOGGER.warning("Deleting npc " + getName() + " NPCID[" + ((L2Npc) this).getId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
deleteMe();
}
else
{
LOGGER.warning("Deleting object " + getName() + " OID[" + getObjectId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
deleteMe();
}
}
}
/**

28
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -81,6 +81,7 @@ import com.l2jmobius.gameserver.model.TeleportWhereType;
import com.l2jmobius.gameserver.model.TimeStamp;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2TrapInstance;
import com.l2jmobius.gameserver.model.actor.stat.CharStat;
import com.l2jmobius.gameserver.model.actor.status.CharStatus;
@ -3007,7 +3008,32 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
ZoneManager.getInstance().getRegion(this).revalidateZones(this);
final ZoneRegion region = ZoneManager.getInstance().getRegion(this);
if (region != null)
{
region.revalidateZones(this);
}
else // Precaution. Moved at invalid region?
{
if (isPlayer())
{
stopMove(((L2PcInstance) this).getLastServerPosition());
}
else if (isServitor())
{
((L2ServitorInstance) this).unSummon(((L2ServitorInstance) this).getOwner());
}
else if (isNpc())
{
LOGGER.warning("Deleting npc " + getName() + " NPCID[" + ((L2Npc) this).getId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
deleteMe();
}
else
{
LOGGER.warning("Deleting object " + getName() + " OID[" + getObjectId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
deleteMe();
}
}
}
/**

28
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -81,6 +81,7 @@ import com.l2jmobius.gameserver.model.TeleportWhereType;
import com.l2jmobius.gameserver.model.TimeStamp;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2TrapInstance;
import com.l2jmobius.gameserver.model.actor.stat.CharStat;
import com.l2jmobius.gameserver.model.actor.status.CharStatus;
@ -3007,7 +3008,32 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
ZoneManager.getInstance().getRegion(this).revalidateZones(this);
final ZoneRegion region = ZoneManager.getInstance().getRegion(this);
if (region != null)
{
region.revalidateZones(this);
}
else // Precaution. Moved at invalid region?
{
if (isPlayer())
{
stopMove(((L2PcInstance) this).getLastServerPosition());
}
else if (isServitor())
{
((L2ServitorInstance) this).unSummon(((L2ServitorInstance) this).getOwner());
}
else if (isNpc())
{
LOGGER.warning("Deleting npc " + getName() + " NPCID[" + ((L2Npc) this).getId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
deleteMe();
}
else
{
LOGGER.warning("Deleting object " + getName() + " OID[" + getObjectId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
deleteMe();
}
}
}
/**

28
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -81,6 +81,7 @@ import com.l2jmobius.gameserver.model.TeleportWhereType;
import com.l2jmobius.gameserver.model.TimeStamp;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2TrapInstance;
import com.l2jmobius.gameserver.model.actor.stat.CharStat;
import com.l2jmobius.gameserver.model.actor.status.CharStatus;
@ -3007,7 +3008,32 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
ZoneManager.getInstance().getRegion(this).revalidateZones(this);
final ZoneRegion region = ZoneManager.getInstance().getRegion(this);
if (region != null)
{
region.revalidateZones(this);
}
else // Precaution. Moved at invalid region?
{
if (isPlayer())
{
stopMove(((L2PcInstance) this).getLastServerPosition());
}
else if (isServitor())
{
((L2ServitorInstance) this).unSummon(((L2ServitorInstance) this).getOwner());
}
else if (isNpc())
{
LOGGER.warning("Deleting npc " + getName() + " NPCID[" + ((L2Npc) this).getId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
deleteMe();
}
else
{
LOGGER.warning("Deleting object " + getName() + " OID[" + getObjectId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
deleteMe();
}
}
}
/**

28
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -69,6 +69,7 @@ import com.l2jmobius.gameserver.model.TeleportWhereType;
import com.l2jmobius.gameserver.model.TimeStamp;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
import com.l2jmobius.gameserver.model.actor.stat.CharStat;
import com.l2jmobius.gameserver.model.actor.status.CharStatus;
import com.l2jmobius.gameserver.model.actor.tasks.character.FlyToLocationTask;
@ -4002,7 +4003,32 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
ZoneManager.getInstance().getRegion(this).revalidateZones(this);
final ZoneRegion region = ZoneManager.getInstance().getRegion(this);
if (region != null)
{
region.revalidateZones(this);
}
else // Precaution. Moved at invalid region?
{
if (isPlayer())
{
stopMove(((L2PcInstance) this).getLastServerPosition());
}
else if (isServitor())
{
((L2ServitorInstance) this).unSummon(((L2ServitorInstance) this).getOwner());
}
else if (isNpc())
{
LOGGER.warning("Deleting npc " + getName() + " NPCID[" + ((L2Npc) this).getId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
deleteMe();
}
else
{
LOGGER.warning("Deleting object " + getName() + " OID[" + getObjectId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
deleteMe();
}
}
}
/**

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

@ -81,6 +81,7 @@ import com.l2jmobius.gameserver.model.TeleportWhereType;
import com.l2jmobius.gameserver.model.TimeStamp;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2TrapInstance;
import com.l2jmobius.gameserver.model.actor.stat.CharStat;
import com.l2jmobius.gameserver.model.actor.status.CharStatus;
@ -3007,7 +3008,32 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
ZoneManager.getInstance().getRegion(this).revalidateZones(this);
final ZoneRegion region = ZoneManager.getInstance().getRegion(this);
if (region != null)
{
region.revalidateZones(this);
}
else // Precaution. Moved at invalid region?
{
if (isPlayer())
{
stopMove(((L2PcInstance) this).getLastServerPosition());
}
else if (isServitor())
{
((L2ServitorInstance) this).unSummon(((L2ServitorInstance) this).getOwner());
}
else if (isNpc())
{
LOGGER.warning("Deleting npc " + getName() + " NPCID[" + ((L2Npc) this).getId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
deleteMe();
}
else
{
LOGGER.warning("Deleting object " + getName() + " OID[" + getObjectId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
deleteMe();
}
}
}
/**

28
L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -81,6 +81,7 @@ import com.l2jmobius.gameserver.model.TeleportWhereType;
import com.l2jmobius.gameserver.model.TimeStamp;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2TrapInstance;
import com.l2jmobius.gameserver.model.actor.stat.CharStat;
import com.l2jmobius.gameserver.model.actor.status.CharStatus;
@ -3007,7 +3008,32 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
ZoneManager.getInstance().getRegion(this).revalidateZones(this);
final ZoneRegion region = ZoneManager.getInstance().getRegion(this);
if (region != null)
{
region.revalidateZones(this);
}
else // Precaution. Moved at invalid region?
{
if (isPlayer())
{
stopMove(((L2PcInstance) this).getLastServerPosition());
}
else if (isServitor())
{
((L2ServitorInstance) this).unSummon(((L2ServitorInstance) this).getOwner());
}
else if (isNpc())
{
LOGGER.warning("Deleting npc " + getName() + " NPCID[" + ((L2Npc) this).getId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
deleteMe();
}
else
{
LOGGER.warning("Deleting object " + getName() + " OID[" + getObjectId() + "] from invalid location X:" + getX() + " Y:" + getY() + " Z:" + getZ());
deleteMe();
}
}
}
/**