From 194de920cf597e8ad92784653792108296a96059 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Fri, 20 Jun 2014 21:48:44 +0100 Subject: Fix attachments not being reset between worlds. --- .../groupmanager/permissions/BukkitPermissions.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java') diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java index dc2197c91..36ac1e8c9 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java @@ -150,7 +150,8 @@ public class BukkitPermissions { String uuid = player.getUniqueId().toString(); // Reset the User objects player reference. - User user = plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getUser(uuid); + User user = plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getUser(player.getUniqueId().toString(), player.getName()); + if (user != null) user.updatePlayer(player); @@ -399,11 +400,11 @@ public class BukkitPermissions { * * @param player */ - private void removeAttachment(String playerName) { + private void removeAttachment(String uuid) { - if (attachments.containsKey(playerName)) { - attachments.get(playerName).remove(); - attachments.remove(playerName); + if (attachments.containsKey(uuid)) { + attachments.get(uuid).remove(); + attachments.remove(uuid); } } @@ -442,7 +443,7 @@ public class BukkitPermissions { /* * Tidy up any lose ends */ - removeAttachment(player.getName()); + removeAttachment(player.getUniqueId().toString()); // force GM to create the player if they are not already listed. plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getUser(player.getUniqueId().toString(), player.getName()); @@ -473,7 +474,7 @@ public class BukkitPermissions { /* * force remove any attachments as bukkit may not */ - removeAttachment(player.getName()); + removeAttachment(player.getUniqueId().toString()); } } -- cgit v1.2.3