NPE check when removing player from region zones.

This commit is contained in:
MobiusDevelopment
2022-01-29 23:38:26 +00:00
parent 26045e9bf0
commit 212b19797f
26 changed files with 163 additions and 54 deletions

View File

@@ -11183,7 +11183,7 @@ public class Player extends Playable
// Stop all toggles.
getEffectList().stopAllToggles();
// Remove from world regions zones
// Remove from world regions zones.
final ZoneRegion region = ZoneManager.getInstance().getRegion(this);
if (region != null)
{

View File

@@ -21,8 +21,6 @@ import java.util.logging.Logger;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.events.EventDispatcher;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
@@ -138,7 +136,6 @@ public class Disconnection
{
if ((_player != null) && _player.isOnline())
{
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogout(_player), _player);
_player.deleteMe();
}
}