Quick fix for issue where people who had homes with capital letters were unable to delete them

RhythmicSys · RhythmicSys · commit 38e2775efb90 · 2025-06-16T13:58:05.000-07:00
diff --git a/src/main/java/simplexity/simplehomes/commands/CommandUtils.java b/src/main/java/simplexity/simplehomes/commands/CommandUtils.java
@@ -22,7 +22,7 @@ public class CommandUtils {
 
     public static Home getHomeFromList(List<Home> homes, String homeName) {
         for (Home home : homes) {
-            if (home.name().equalsIgnoreCase(homeName)) {
+            if (home.name().equals(homeName)) {
                 return home;
             }
         }
@@ -41,7 +41,6 @@ public static int maxHomesPermission(Player player) {
         int maxHomes = 0;
         for (PermissionAttachmentInfo pai : player.getEffectivePermissions()) {
             String permission = pai.getPermission();
-            if (!pai.getValue()) continue; //if the permission is set false, skip it
             if (!pai.getValue() || !permission.startsWith(COUNT_BASE))
                 continue; // if the permission is set false, if it isn't ours, skip it
             permission = permission.replace(COUNT_BASE, ""); //
diff --git a/src/main/java/simplexity/simplehomes/commands/DeleteHome.java b/src/main/java/simplexity/simplehomes/commands/DeleteHome.java
@@ -36,12 +36,17 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                     Placeholder.parsed("command", "/delhome"));
             return false;
         }
-        String homeName = args[0].toLowerCase();
+        String homeName = args[0];
         Home homeRequested = CommandUtils.getHomeFromList(playerHomesList, homeName);
+        if (homeRequested == null) {
+            player.sendRichMessage(
+                    LocaleHandler.getInstance().getHomeNotFound(),
+                    Placeholder.parsed("name", homeName));
+        }
         if (!shouldDelete(homeRequested, player, homeName)) return false;
         //Need to parse the message before deleting the home otherwise there's no home to send into the method. At least that's what happened originally.
         //Probably had to do with how I was originally putting it in but whatever, I'm doing it here now.
-        Component parsedHomeDeleteMessage = LocaleHandler.getInstance().locationResolver(homeRequested,
+        Component parsedHomeDeleteMessage = LocaleHandler.getInstance().homeComponent(homeRequested,
                 LocaleHandler.getInstance().getHomeDeleted());
         Cache.getInstance().removeHomeByName(player.getUniqueId(), homeName);
         player.sendMessage(parsedHomeDeleteMessage);
diff --git a/src/main/java/simplexity/simplehomes/commands/HomeList.java b/src/main/java/simplexity/simplehomes/commands/HomeList.java
@@ -3,13 +3,15 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import simplexity.simplehomes.Home;
 import simplexity.simplehomes.SimpleHomes;
+import simplexity.simplehomes.configs.ConfigHandler;
 import simplexity.simplehomes.configs.LocaleHandler;
 import simplexity.simplehomes.saving.Cache;
 
@@ -33,12 +35,17 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                     Placeholder.parsed("command", "/homelist"));
             return false;
         }
-        Component listMessage = createHomesListMessage(playerHomes);
+        Home bedHome = null;
+        Location potentialBedLocation = player.getPotentialBedLocation();
+        if (potentialBedLocation != null) {
+            bedHome = new Home(ConfigHandler.getInstance().getBedHomesName(), potentialBedLocation);
+        }
+        Component listMessage = createHomesListMessage(playerHomes, bedHome);
         player.sendMessage(listMessage);
         return true;
     }
 
-    private Component createHomesListMessage(List<Home> homesList) {
+    private Component createHomesListMessage(List<Home> homesList, Home bedHome) {
         Component messageToSend = miniMessage.deserialize(LocaleHandler.getInstance().getListHeader());
         if (homesList.isEmpty()) {
             messageToSend = messageToSend
@@ -49,7 +56,12 @@ private Component createHomesListMessage(List<Home> homesList) {
         for (Home home : homesList) {
             messageToSend = messageToSend
                     .appendNewline()
-                    .append(LocaleHandler.getInstance().locationResolver(home, LocaleHandler.getInstance().getListItem()));
+                    .append(LocaleHandler.getInstance().homeComponent(home, LocaleHandler.getInstance().getListItem()));
+        }
+        if (bedHome != null) {
+            messageToSend = messageToSend
+                    .appendNewline()
+                    .append(LocaleHandler.getInstance().bedHomeComponent(bedHome, LocaleHandler.getInstance().getListItem()));
         }
         return messageToSend;
     }
diff --git a/src/main/java/simplexity/simplehomes/configs/LocaleHandler.java b/src/main/java/simplexity/simplehomes/configs/LocaleHandler.java
@@ -6,6 +6,7 @@
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.jetbrains.annotations.NotNull;
 import simplexity.simplehomes.Home;
 import simplexity.simplehomes.SimpleHomes;
 
@@ -24,7 +25,7 @@ public class LocaleHandler {
     //---------
     private String mustBePlayer, provideHomeName, homeAlreadyExists, homeNotFound, nullHome, cannotSetMoreHomes,
             cannotUseCommand, errorHasOccurred, noPermission;
-    private String insertName, insertWorld, insertXLoc, insertYLoc, insertZLoc, insertOverride;
+    private String insertName, insertWorld, insertXLoc, insertYLoc, insertZLoc, insertOverride, insertBedName;
     private String homeSet, homeDeleted, homeTeleported, pluginReloaded, listHeader, listItem, listNoHomes;
     private String blacklistedWarning, voidWarning, fireWarning, blocksWarning, lavaWarning, waterWarning;
     private String unsupportedDestructive, importHelp, importNotEnoughArgs, onlyConsole, cannotConfirm, timedOut, noValidPlugin,
@@ -63,6 +64,7 @@ public void loadLocale() {
         errorHasOccurred = localeConfig.getString("errors.error-has-occurred", "<red>An error has occurred while running this command. Please contact the server staff to let them know (-SimpleHomes Plugin)</red>");
         noPermission = localeConfig.getString("errors.no-permission", "<red>You do not have permission to use <value></red>");
         insertName = localeConfig.getString("inserts.name", "<yellow><name></yellow>");
+        insertBedName = localeConfig.getString("inserts.bed-name", "<dark_gray><name></dark_gray>");
         insertWorld = localeConfig.getString("inserts.world", "<yellow><world></yellow>");
         insertXLoc = localeConfig.getString("inserts.x-loc", "<yellow><x-loc>x</yellow>,");
         insertYLoc = localeConfig.getString("inserts.y-loc", "<yellow><y-loc>y</yellow>,");
@@ -173,10 +175,7 @@ public String getListItem() {
         return listItem;
     }
 
-    public Component locationResolver(Home home, String message) {
-        if (home == null) {
-            return null;
-        }
+    public Component homeComponent(@NotNull Home home, String message) {
         Component nameComponent = miniMessage.deserialize(insertName,
                 Placeholder.unparsed("name", home.name()));
         Component worldComponent = miniMessage.deserialize(insertWorld,
@@ -195,6 +194,25 @@ public Component locationResolver(Home home, String message) {
                 Placeholder.component("z-loc", zComponent));
     }
 
+    public Component bedHomeComponent(@NotNull Home home, String message) {
+        Component nameComponent = miniMessage.deserialize(insertBedName,
+                Placeholder.unparsed("name", ConfigHandler.getInstance().getBedHomesName()));
+        Component worldComponent = miniMessage.deserialize(insertWorld,
+                Placeholder.unparsed("world", home.location().getWorld().getName()));
+        Component xComponent = miniMessage.deserialize(insertXLoc,
+                Placeholder.unparsed("x-loc", String.valueOf(home.location().getBlockX())));
+        Component yComponent = miniMessage.deserialize(insertYLoc,
+                Placeholder.unparsed("y-loc", String.valueOf(home.location().getBlockY())));
+        Component zComponent = miniMessage.deserialize(insertZLoc,
+                Placeholder.unparsed("z-loc", String.valueOf(home.location().getBlockZ())));
+        return miniMessage.deserialize(message,
+                Placeholder.component("name", nameComponent),
+                Placeholder.component("world", worldComponent),
+                Placeholder.component("x-loc", xComponent),
+                Placeholder.component("y-loc", yComponent),
+                Placeholder.component("z-loc", zComponent));
+    }
+
     public String getListNoHomes() {
         return listNoHomes;
     }
@@ -296,4 +314,7 @@ public String getNoPermission() {
         return noPermission;
     }
 
+    public String getInsertBedName() {
+        return insertBedName;
+    }
 }
diff --git a/src/main/java/simplexity/simplehomes/saving/Cache.java b/src/main/java/simplexity/simplehomes/saving/Cache.java
@@ -24,10 +24,7 @@ public static Cache getInstance() {
     private final HashMap<UUID, List<Home>> cachedHomes = new HashMap<>();
 
     public List<Home> getPlayerHomes(UUID playerUuid) {
-        // Get cached homes if they're already cached, and returned
         if (cachedHomes.containsKey(playerUuid)) return cachedHomes.get(playerUuid);
-        // Otherwise, query the database, and cache the results, or create a blank array list and add it if there is no
-        // results. Return the newly cached data.
         List<Home> savedHomes = SQLHandler.getInstance().getHomes(playerUuid);
         if (savedHomes == null || savedHomes.isEmpty()) savedHomes = new ArrayList<>();
         cachedHomes.put(playerUuid, savedHomes);
@@ -62,7 +59,7 @@ public void removePlayerFromCache(UUID playerUuid) {
     @SuppressWarnings("JavaExistingMethodCanBeUsed")
     private Home getHomeFromList(List<Home> homes, String homeName) {
         for (Home home : homes) {
-            if (home.name().equalsIgnoreCase(homeName)) {
+            if (home.name().equals(homeName)) {
                 return home;
             }
         }
diff --git a/src/main/java/simplexity/simplehomes/saving/SQLHandler.java b/src/main/java/simplexity/simplehomes/saving/SQLHandler.java
@@ -91,7 +91,6 @@ public List<Home> getHomes(UUID uuid) {
     }
 
     public void deleteHome(UUID uuid, String homeName) {
-        // Prepare the SQL statement to check if the home exists
         String checkIfExistsQuery = "SELECT * FROM homes WHERE player_uuid = ? AND home_name = ?";
         try (PreparedStatement homeExists = getConnection().prepareStatement(checkIfExistsQuery)) {
             homeExists.setString(1, uuid.toString());

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,6 @@ public List<Home> getHomes(UUID uuid) {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`public void deleteHome(UUID uuid, String homeName) {`
`94`		`- // Prepare the SQL statement to check if the home exists`
`95`	`94`	`String checkIfExistsQuery = "SELECT * FROM homes WHERE player_uuid = ? AND home_name = ?";`
`96`	`95`	`try (PreparedStatement homeExists = getConnection().prepareStatement(checkIfExistsQuery)) {`
`97`	`96`	`homeExists.setString(1, uuid.toString());`