From 0502b5b6eb891de24f8b6651a648445287145a09 Mon Sep 17 00:00:00 2001 From: FireInstall Date: Mon, 20 Mar 2023 20:05:29 +0100 Subject: [PATCH] tap complete games for setting locations fix armor stands not getting removed properly --- .../java/de/greensurvivors/findme/comands/SetCmd.java | 9 +++++++++ .../java/de/greensurvivors/findme/dataObjects/Game.java | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/greensurvivors/findme/comands/SetCmd.java b/src/main/java/de/greensurvivors/findme/comands/SetCmd.java index 6ca2661..5621837 100644 --- 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 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 index cbea674..fb06fa6 100644 --- 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(); } } }