minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-16 03:24:31 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/groupmanager'

Browse Source
This commit is contained in:
md_5
2012-06-21 18:27:21 +10:00
parent ecc2e17ff7 f8d6337364
commit 028b1e426f
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java
View File

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

8
EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
View File

@@ -31,6 +31,7 @@ import java.util.Set;
import java.util.WeakHashMap; import java.util.WeakHashMap;
import org.anjocaido.groupmanager.GroupManager; import org.anjocaido.groupmanager.GroupManager;
import org.anjocaido.groupmanager.data.User;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@@ -144,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;
@@ -440,7 +446,7 @@ public class BukkitPermissions {
public void onPlayerKick(PlayerKickEvent event) { public void onPlayerKick(PlayerKickEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
/* /*
* force remove any attachments as bukkit may not * force remove any attachments as bukkit may not
*/ */