1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-13 18:14:38 +02:00

Merge remote-tracking branch 'origin/groupmanager'

This commit is contained in:
md_5
2012-06-21 18:27:21 +10:00
2 changed files with 9 additions and 4 deletions

View File

@@ -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;
}

View File

@@ -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;
@@ -145,6 +146,11 @@ public class BukkitPermissions {
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;
// Find the players current attachment, or add a new one.