From 5683ea35fc60eafe70753fb9b2261b8537ed0b0f Mon Sep 17 00:00:00 2001 From: ElgarL Date: Sat, 16 Jun 2012 19:12:54 +0100 Subject: Better update for the User object player reference. --- .../src/org/anjocaido/groupmanager/data/User.java | 7 +------ .../groupmanager/permissions/BukkitPermissions.java | 13 +++++-------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java index 77cca7b1e..6c74c2e50 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java @@ -256,15 +256,10 @@ public class User extends DataUnit implements Cloneable { } } - public void clearPlayer() { - bukkitPlayer = null; - } public User updatePlayer(Player player) { - if (player != null) { - bukkitPlayer = player; - } + bukkitPlayer = player; return this; } diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java index bd48d5079..05e152286 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java @@ -145,6 +145,11 @@ public class BukkitPermissions { if (player == null || !GroupManager.isLoaded()) { return; } + + // Reset the User objects player reference. + User user = plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getUser(player.getName()); + if (user != null) + user.updatePlayer(player); PermissionAttachment attachment; @@ -441,10 +446,6 @@ public class BukkitPermissions { public void onPlayerKick(PlayerKickEvent event) { Player player = event.getPlayer(); - - User user = plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getUser(player.getName()); - if (user != null) - user.clearPlayer(); /* * force remove any attachments as bukkit may not @@ -459,10 +460,6 @@ public class BukkitPermissions { return; Player player = event.getPlayer(); - - User user = plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getUser(player.getName()); - if (user != null) - user.clearPlayer(); /* * force remove any attachments as bukkit may not -- cgit v1.2.3