diff options
author | md_5 <md_5@bigpond.com> | 2012-06-21 18:27:21 +1000 |
---|---|---|
committer | md_5 <md_5@bigpond.com> | 2012-06-21 18:27:21 +1000 |
commit | 57cbeb6178083a3668a8f6d43f8643e8be729bd8 (patch) | |
tree | 9697d5c91c2ad28ff8e4f306661deb8f33faabc0 | |
parent | 74eda330cffd07e5405eba89f67a987ba37da6db (diff) | |
parent | a5bac7a3c8833b90e9199458e240808d0509357c (diff) | |
download | Essentials-57cbeb6178083a3668a8f6d43f8643e8be729bd8.tar Essentials-57cbeb6178083a3668a8f6d43f8643e8be729bd8.tar.gz Essentials-57cbeb6178083a3668a8f6d43f8643e8be729bd8.tar.lz Essentials-57cbeb6178083a3668a8f6d43f8643e8be729bd8.tar.xz Essentials-57cbeb6178083a3668a8f6d43f8643e8be729bd8.zip |
Merge remote-tracking branch 'origin/groupmanager'
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java | 5 | ||||
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java index c10658fb0..6c74c2e50 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java @@ -256,11 +256,10 @@ public class User extends DataUnit implements Cloneable { } } + 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 e8322c391..05e152286 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java @@ -31,6 +31,7 @@ import java.util.Set; import java.util.WeakHashMap;
import org.anjocaido.groupmanager.GroupManager;
+import org.anjocaido.groupmanager.data.User;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
@@ -144,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;
@@ -440,7 +446,7 @@ public class BukkitPermissions { public void onPlayerKick(PlayerKickEvent event) {
Player player = event.getPlayer();
-
+
/*
* force remove any attachments as bukkit may not
*/
|