Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2025-02-17 21:02:12 +01:00
Code Issues Projects Releases Wiki Activity

Fix NPE when player quits

Browse Source
This commit is contained in:
Daniel Saukel 2020-03-18 13:02:25 +01:00
parent 9a10bea264
commit 2eb3ab6332
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/de/erethon/dungeonsxl/player/DPlayerListener.java
View File

@ -21,7 +21,6 @@ import de.erethon.caliburn.item.ExItem;
import de.erethon.caliburn.item.VanillaItem; import de.erethon.caliburn.item.VanillaItem;
import de.erethon.commons.chat.MessageUtil; import de.erethon.commons.chat.MessageUtil;
import de.erethon.dungeonsxl.DungeonsXL; import de.erethon.dungeonsxl.DungeonsXL;
import de.erethon.dungeonsxl.api.dungeon.Dungeon;
import de.erethon.dungeonsxl.api.dungeon.Game; import de.erethon.dungeonsxl.api.dungeon.Game;
import de.erethon.dungeonsxl.api.dungeon.GameRule; import de.erethon.dungeonsxl.api.dungeon.GameRule;
import de.erethon.dungeonsxl.api.player.EditPlayer; import de.erethon.dungeonsxl.api.player.EditPlayer;
@ -414,7 +413,6 @@ public class DPlayerListener implements Listener {
Player player = event.getPlayer(); Player player = event.getPlayer();
GlobalPlayer dPlayer = dPlayers.get(player); GlobalPlayer dPlayer = dPlayers.get(player);
PlayerGroup dGroup = dPlayer.getGroup(); PlayerGroup dGroup = dPlayer.getGroup();
Dungeon dungeon = dGroup.getDungeon();
if (!(dPlayer instanceof InstancePlayer)) { if (!(dPlayer instanceof InstancePlayer)) {
if (dGroup != null) { if (dGroup != null) {
@ -422,7 +420,7 @@ public class DPlayerListener implements Listener {
} }
} else if (dPlayer instanceof GamePlayer) { } else if (dPlayer instanceof GamePlayer) {
int timeUntilKickOfflinePlayer = dungeon.getRules().getState(GameRule.TIME_UNTIL_KICK_OFFLINE_PLAYER); int timeUntilKickOfflinePlayer = dGroup.getDungeon().getRules().getState(GameRule.TIME_UNTIL_KICK_OFFLINE_PLAYER);
if (timeUntilKickOfflinePlayer == 0) { if (timeUntilKickOfflinePlayer == 0) {
((InstancePlayer) dPlayer).leave(); ((InstancePlayer) dPlayer).leave();