TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 04:20:41 +00:00
Code Issues Projects Releases Wiki Activity

Better update for the User object player reference.

Browse source
This commit is contained in:
ElgarL 2012-06-16 19:12:54 +01:00
parent 78d4987d5d
commit 5683ea35fc
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java
View file

@ -256,15 +256,10 @@ public class User extends DataUnit implements Cloneable {
} }
} }
public void clearPlayer() {
bukkitPlayer = null;
}
public User updatePlayer(Player player) { public User updatePlayer(Player player) {
if (player != null) { bukkitPlayer = player;
bukkitPlayer = player;
}
return this; return this;
} }

13
EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
View file

@ -145,6 +145,11 @@ public class BukkitPermissions {
if (player == null || !GroupManager.isLoaded()) { if (player == null || !GroupManager.isLoaded()) {
return; 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; PermissionAttachment attachment;
@ -441,10 +446,6 @@ public class BukkitPermissions {
public void onPlayerKick(PlayerKickEvent event) { public void onPlayerKick(PlayerKickEvent event) {
Player player = event.getPlayer(); 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 * force remove any attachments as bukkit may not
@ -459,10 +460,6 @@ public class BukkitPermissions {
return; return;
Player player = event.getPlayer(); 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 * force remove any attachments as bukkit may not