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

NPE check when removing player from region zones.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

9
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -269,6 +269,7 @@ import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.model.variables.AccountVariables;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.model.zone.ZoneRegion;
import org.l2jmobius.gameserver.model.zone.ZoneType;
import org.l2jmobius.gameserver.model.zone.type.WaterZone;
import org.l2jmobius.gameserver.network.Disconnection;
@ -10941,8 +10942,12 @@ public class Player extends Playable
// Stop all toggles.
getEffectList().stopAllToggles();
// Remove from world regions zones
ZoneManager.getInstance().getRegion(this).removeFromZones(this);
// Remove from world regions zones.
final ZoneRegion region = ZoneManager.getInstance().getRegion(this);
if (region != null)
{
region.removeFromZones(this);
}
// If a Party is in progress, leave it (and festival party)
if (isInParty())