Use UUID. Fix /cremoveall, /climits, /lwc admin purge <player>

Hidendra · Mar 19, 2015 · e1967ff · e1967ff
1 parent 021f8d1
commit e1967ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/core/src/main/java/com/griefcraft/lwc/LWC.java b/core/src/main/java/com/griefcraft/lwc/LWC.java
@@ -938,7 +938,8 @@ public static String materialToString(Block block) {
      */
     public int fastRemoveProtectionsByPlayer(CommandSender sender, String player, boolean shouldRemoveBlocks) {
         // remove their protections first
-        int ret = fastRemoveProtections(sender, "Lower(owner) = Lower('" + player + "')", shouldRemoveBlocks);
+        UUID uuid = UUIDRegistry.getUUID(player);
+        int ret = fastRemoveProtections(sender, "Lower(owner) = Lower('" + (uuid != null ? uuid.toString() : player) + "')", shouldRemoveBlocks);
 
         // invalid any history objects associated with the player
         physicalDatabase.invalidateHistory(player);

diff --git a/core/src/main/java/com/griefcraft/sql/PhysDB.java b/core/src/main/java/com/griefcraft/sql/PhysDB.java
@@ -166,7 +166,8 @@ public int getProtectionCount(String player) {
 
         try {
             PreparedStatement statement = prepare("SELECT COUNT(*) as count FROM " + prefix + "protections WHERE owner = ?");
-            statement.setString(1, player);
+            UUID uuid = UUIDRegistry.getUUID(player);
+            statement.setString(1, uuid != null ? uuid.toString() : player);
 
             ResultSet set = statement.executeQuery();
 
@@ -193,7 +194,8 @@ public int getHistoryCount(String player) {
 
         try {
             PreparedStatement statement = prepare("SELECT COUNT(*) AS count FROM " + prefix + "history WHERE LOWER(player) = LOWER(?)");
-            statement.setString(1, player);
+            UUID uuid = UUIDRegistry.getUUID(player);
+            statement.setString(1, uuid != null ? uuid.toString() : player);
 
             ResultSet set = statement.executeQuery();
 
@@ -220,7 +222,8 @@ public int getProtectionCount(String player, int blockId) {
 
         try {
             PreparedStatement statement = prepare("SELECT COUNT(*) AS count FROM " + prefix + "protections WHERE owner = ? AND blockId = ?");
-            statement.setString(1, player);
+            UUID uuid = UUIDRegistry.getUUID(player);
+            statement.setString(1, uuid != null ? uuid.toString() : player);
             statement.setInt(2, blockId);
 
             ResultSet set = statement.executeQuery();
@@ -1074,7 +1077,8 @@ public List<Protection> loadProtectionsByPlayer(String player) {
 
         try {
             PreparedStatement statement = prepare("SELECT id, owner, type, x, y, z, data, blockId, world, password, date, last_accessed FROM " + prefix + "protections WHERE owner = ?");
-            statement.setString(1, player);
+            UUID uuid = UUIDRegistry.getUUID(player);
+            statement.setString(1, uuid != null ? uuid.toString() : player);
 
             return resolveProtections(statement);
         } catch (Exception e) {