From 110913b9c7b4c6f15ca04b63e4f42895b8c53920 Mon Sep 17 00:00:00 2001
From: Daniel Saukel <sa.da@unitybox.de>
Date: Mon, 23 Mar 2020 20:59:03 +0100
Subject: [PATCH] Fix global sign NPEs

---
 core/src/main/java/de/erethon/dungeonsxl/global/GameSign.java  | 2 +-
 core/src/main/java/de/erethon/dungeonsxl/global/LeaveSign.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/de/erethon/dungeonsxl/global/GameSign.java b/core/src/main/java/de/erethon/dungeonsxl/global/GameSign.java
index 57841365..7558b3ea 100644
--- a/core/src/main/java/de/erethon/dungeonsxl/global/GameSign.java
+++ b/core/src/main/java/de/erethon/dungeonsxl/global/GameSign.java
@@ -152,8 +152,8 @@ public class GameSign extends JoinSign {
                 return;
             }
 
-            game = new DGame(plugin, dGroup);
             dGroup.setDungeon(dungeon);
+            game = new DGame(plugin, dGroup);
             update();
 
         } else if (topSign.getLine(0).equals(DMessage.SIGN_GLOBAL_JOIN_GAME.getMessage())) {
diff --git a/core/src/main/java/de/erethon/dungeonsxl/global/LeaveSign.java b/core/src/main/java/de/erethon/dungeonsxl/global/LeaveSign.java
index 362b35e1..2dd41e7c 100644
--- a/core/src/main/java/de/erethon/dungeonsxl/global/LeaveSign.java
+++ b/core/src/main/java/de/erethon/dungeonsxl/global/LeaveSign.java
@@ -97,7 +97,7 @@ public class LeaveSign extends GlobalProtection {
             gamePlayer.leave();
 
         } else {
-            PlayerGroup group = gamePlayer.getGroup();
+            PlayerGroup group = plugin.getPlayerGroup(player);
             if (group != null) {
                 group.removePlayer(player);
                 MessageUtil.sendMessage(player, DMessage.PLAYER_LEAVE_GROUP.getMessage());