tap complete games for setting locations

fix armor stands not getting removed properly
GreenSurvivors · Mar 22, 2023 · 0502b5b · 0502b5b
1 parent 6a66d38
commit 0502b5b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/de/greensurvivors/findme/comands/SetCmd.java b/src/main/java/de/greensurvivors/findme/comands/SetCmd.java
@@ -288,13 +288,22 @@ public static List<String> handleTap(CommandSender cs, String[] args) {
                 return result.stream().filter(s -> s.toLowerCase().startsWith(args[1])).collect(Collectors.toList());
             }
             case 3 -> {
+                //heads
                 if (args[1].equalsIgnoreCase(HEADS)) {
                     if (PermissionUtils.hasPermission(cs, PermissionUtils.FINDME_ADMIN, PermissionUtils.FINDME_SET, PermissionUtils.FINDME_SET_HEADS)){
                         return GameManager.inst().getGameNames().stream().filter(s -> s.toLowerCase().startsWith(args[2])).collect(Collectors.toList());
                     }
+                //late join
                 } else if ((args[1].equalsIgnoreCase(LATE_JOIN_LONG) || args[1].equalsIgnoreCase(LATE_JOIN_SHORT)) &&
                         PermissionUtils.hasPermission(cs, PermissionUtils.FINDME_ADMIN, PermissionUtils.FINDME_SET, PermissionUtils.FINDME_SET_LATEJOIN)){
                     return Stream.of(String.valueOf(true), String.valueOf(false)).filter(s -> s.toLowerCase().startsWith(args[2])).collect(Collectors.toList());
+                //locations
+                } else if (args[1].equalsIgnoreCase(LOBBY) ||
+                        args[1].equalsIgnoreCase(STARTPOINT_LONG) ||
+                        args[1].equalsIgnoreCase(STARTPOINT_SHORT) || args[1].equalsIgnoreCase(ENDPOINT_LONG) || args[1].equalsIgnoreCase(ENDPOINT_SHORT) || args[1].equalsIgnoreCase(ENDPOINT_ALT)){
+                    if (PermissionUtils.hasPermission(cs, PermissionUtils.FINDME_ADMIN, PermissionUtils.FINDME_SET_LOCATIONS)){
+                        return GameManager.inst().getGameNames().stream().filter(s -> s.toLowerCase().startsWith(args[2])).collect(Collectors.toList());
+                    }
                 }
             }
         }

diff --git a/src/main/java/de/greensurvivors/findme/dataObjects/Game.java b/src/main/java/de/greensurvivors/findme/dataObjects/Game.java
@@ -502,12 +502,12 @@ public void removeHideaway(@NotNull UUID uuid){
         if (hideaway != null){
             Slime slime = hideaway.getSlime();
             if (slime != null){
-                slime.setHealth(0);
+                slime.remove();;
             }
 
             ArmorStand armorStand = hideaway.getArmorStand();
             if (armorStand != null){
-                armorStand.setHealth(0);
+                armorStand.remove();;
             }
         }
 
@@ -527,7 +527,7 @@ protected void removeAllHideaways() {
 
                 ArmorStand armorStand = hideaway.getArmorStand();
                 if (armorStand != null) {
-                    armorStand.setHealth(0);
+                    armorStand.remove();
                 }
             }
         }