From de1d7e97cbf6977c0a8899a58e9efab14c85ba13 Mon Sep 17 00:00:00 2001 From: Daniel Saukel Date: Tue, 27 Dec 2016 00:56:45 +0100 Subject: [PATCH] Added some null checks to DGamePlayer#leave() --- .../java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java index 28581bb5..7a5138c9 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java @@ -462,7 +462,13 @@ public class DGamePlayer extends DInstancePlayer { */ public void leave(boolean message) { Game game = Game.getByWorld(getWorld()); + if (game == null) { + return; + } DGameWorld gameWorld = game.getWorld(); + if (gameWorld == null) { + return; + } GameRules rules = game.getRules(); delete();