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

- Reverted WorldHolder static change to maintain backward plugin

Browse Source 
compatability.
This commit is contained in:
ElgarL
2011-09-21 12:30:11 +01:00
parent 2bdc00dc14
commit de744fe9e2
4 changed files with 70 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
EssentialsGroupManager/src/Changelog.txt
View File

@@ -11,4 +11,5 @@ v 1.1:
- Fix for an infinite loop bug with the new Bukkit Perms during a new user creation.
- Fixed BukkitPerms population. Wasn't correctly setting superperms.
- Push updates to superperms for all valid GM commands.
- All GroupManager commands issued by players are now echoed in the console.
- All GroupManager commands issued by players are now echoed in the console.
- Reverted WorldHolder static change to maintain backward plugin compatability.

6
EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
View File

@@ -47,7 +47,7 @@ public class GroupManager extends JavaPlugin {
private ScheduledThreadPoolExecutor scheduler;
private Map<String, ArrayList<User>> overloadedUsers = new HashMap<String, ArrayList<User>>();
private Map<CommandSender, String> selectedWorlds = new HashMap<CommandSender, String>();
private static WorldsHolder worldsHolder;
private WorldsHolder worldsHolder;
private boolean validateOnlinePlayer = true;
private boolean isReady = false;
public static boolean isLoaded = false;
@@ -123,7 +123,7 @@ public class GroupManager extends JavaPlugin {
@Override
public void run() {
GroupManager.worldsHolder.saveChanges();
worldsHolder.saveChanges();
}
};
scheduler = new ScheduledThreadPoolExecutor(1);
@@ -166,7 +166,7 @@ public class GroupManager extends JavaPlugin {
worldsHolder.reloadAll();
}
public static WorldsHolder getWorldsHolder() {
public WorldsHolder getWorldsHolder() {
return worldsHolder;
}

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

@@ -58,12 +58,12 @@ public class BukkitPermissions {
protected Map<Player, PermissionAttachment> attachments = new HashMap<Player, PermissionAttachment>();
protected Set<Permission> registeredPermissions = new HashSet<Permission>();
protected Plugin plugin;
protected GroupManager plugin;
protected boolean dumpAllPermissions = true;
protected boolean dumpMatchedPermissions = true;
public boolean player_join = false;
public BukkitPermissions(Plugin plugin) {
public BukkitPermissions(GroupManager plugin) {
this.plugin = plugin;
this.collectPermissions();
@@ -120,7 +120,7 @@ public class BukkitPermissions {
// All permissions registered with Bukkit for this player
PermissionAttachment attachment = this.attachments.get(player);
OverloadedWorldHolder worldData = GroupManager.getWorldsHolder().getWorldData(world);
OverloadedWorldHolder worldData = plugin.getWorldsHolder().getWorldData(world);
User user = worldData.getUser(player.getName());
@@ -185,7 +185,7 @@ public class BukkitPermissions {
player_join = true;
Player player = event.getPlayer();
//force GM to create the player if they are not already listed.
if (GroupManager.getWorldsHolder().getWorldData(player.getWorld().getName()).getUser(player.getName()) != null) {
if (plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getUser(player.getName()) != null) {
player_join = false;
updatePermissions(event.getPlayer());
} else