Fix groupless players being inside dungeons; resolves #414

DRE2N · Jun 11, 2018 · 2da4e74 · 2da4e74
1 parent ef17d01
commit 2da4e74
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/main/java/de/erethon/dungeonsxl/player/DGroup.java b/src/main/java/de/erethon/dungeonsxl/player/DGroup.java
@@ -756,6 +756,13 @@ public void delete() {
             game.removeDGroup(this);
         }
 
+        for (UUID uuid : players.getUniqueIds()) {
+            DGlobalPlayer member = dPlayers.getByUniqueId(uuid);
+            if (member instanceof DInstancePlayer) {
+                ((DInstancePlayer) member).leave();
+            }
+        }
+
         if (timeIsRunningTask != null) {
             timeIsRunningTask.cancel();
         }

diff --git a/src/main/java/de/erethon/dungeonsxl/player/DPlayerListener.java b/src/main/java/de/erethon/dungeonsxl/player/DPlayerListener.java
@@ -31,6 +31,7 @@
 import de.erethon.dungeonsxl.world.DGameWorld;
 import de.erethon.dungeonsxl.world.block.LockedDoor;
 import java.util.ArrayList;
+import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.Block;
@@ -520,17 +521,17 @@ public void onPlayerTeleport(PlayerTeleportEvent event) {
         if (isCitizensNPC(player)) {
             return;
         }
-        DGamePlayer dPlayer = DGamePlayer.getByPlayer(player);
+        DGlobalPlayer dPlayer = dPlayers.getByPlayer(player);
 
-        if (dPlayer == null) {
-            return;
-        }
+        World toWorld = event.getTo().getWorld();
 
-        if (dPlayer.getWorld() == event.getTo().getWorld()) {
+        if (dPlayer instanceof DInstancePlayer && ((DInstancePlayer) dPlayer).getWorld() == toWorld) {
             return;
         }
 
-        if (!DPermission.hasPermission(player, DPermission.BYPASS)) {
+        if (plugin.getDWorlds().getInstanceByWorld(toWorld) != null) {
+            dPlayer.sendMessage(DMessage.ERROR_JOIN_GROUP.getMessage());
+            dPlayer.sendMessage(ChatColor.GOLD + DMessage.HELP_CMD_ENTER.getMessage());
             event.setCancelled(true);
         }
     }