Fix /dxl rename; resolves #454

DRE2N · Aug 14, 2018 · 53f8ec8 · 53f8ec8
1 parent fef6a1f
commit 53f8ec8
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/src/main/java/de/erethon/dungeonsxl/command/RenameCommand.java b/src/main/java/de/erethon/dungeonsxl/command/RenameCommand.java
@@ -25,6 +25,7 @@
 import de.erethon.dungeonsxl.global.GameSign;
 import de.erethon.dungeonsxl.global.GlobalProtection;
 import de.erethon.dungeonsxl.global.GroupSign;
+import de.erethon.dungeonsxl.global.JoinSign;
 import de.erethon.dungeonsxl.player.DPermission;
 import de.erethon.dungeonsxl.world.DEditWorld;
 import de.erethon.dungeonsxl.world.DResourceWorld;
@@ -99,20 +100,18 @@ public void onExecute(String[] args, CommandSender sender) {
         }
 
         boolean changed = false;
-        for (GlobalProtection protection : plugin.getGlobalProtections().getProtections()) {
-            if (protection instanceof GroupSign) {
-                Dungeon dungeon = ((GroupSign) protection).getDungeon();
-                if (dungeon.getName().equals(args[1])) {
-                    dungeon.setName(args[2]);
-                    changed = true;
-                }
-
-            } else if (protection instanceof GameSign) {
-                Dungeon dungeon = ((GameSign) protection).getDungeon();
-                if (dungeon.getName().equals(args[1])) {
-                    dungeon.setName(args[2]);
-                    changed = true;
-                }
+        for (GlobalProtection protection : plugin.getGlobalProtections().getProtections().toArray(new GlobalProtection[]{})) {
+            if (!(protection instanceof JoinSign)) {
+                continue;
+            }
+            Dungeon dungeon = ((JoinSign) protection).getDungeon();
+            if (dungeon == null) {
+                protection.delete();
+                continue;
+            }
+            if (dungeon.getName().equals(args[1])) {
+                dungeon.setName(args[2]);
+                changed = true;
             }
         }