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

Merge remote branch 'remotes/ess/groupmanager' into essmaster

Browse source
This commit is contained in:
KHobbits 2011-09-24 03:18:25 +01:00
commit 3177f25eb6
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
EssentialsGroupManager/src/Changelog.txt
View file

@ -14,3 +14,5 @@ v 1.1:
- 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 compatibility. - Reverted WorldHolder static change to maintain backward plugin compatibility.
- Update to handle 'getDescription().getPermissions(') returning a list (CB 1172). - Update to handle 'getDescription().getPermissions(') returning a list (CB 1172).
- Fix for null in PLAYER_TELEPORT for bukkit perms.
- Fixed wasteful updating of perms on a manload.

5
EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
View file

@ -1423,9 +1423,14 @@ public class GroupManager extends JavaPlugin {
auxString += " "; auxString += " ";
} }
} }
isLoaded = false; // Disable Bukkit Perms update
worldsHolder.loadWorld(auxString); worldsHolder.loadWorld(auxString);
sender.sendMessage("The request to world '" + auxString + "' was sent."); sender.sendMessage("The request to world '" + auxString + "' was sent.");
isLoaded = true;
BukkitPermissions.updateAllPlayers(); BukkitPermissions.updateAllPlayers();
return true; return true;

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

@ -195,12 +195,10 @@ public class BukkitPermissions {
@Override @Override
public void onPlayerPortal(PlayerPortalEvent event) { // will portal into another world public void onPlayerPortal(PlayerPortalEvent event) { // will portal into another world
if(event.getPlayer().getWorld().equals(event.getTo().getWorld())){ // only if world actually changed if(!event.getFrom().getWorld().equals(event.getTo().getWorld())){ // only if world actually changed
return;
}
updatePermissions(event.getPlayer(), event.getTo().getWorld().getName()); updatePermissions(event.getPlayer(), event.getTo().getWorld().getName());
} }
}
@Override @Override
public void onPlayerRespawn(PlayerRespawnEvent event) { // can be respawned in another world public void onPlayerRespawn(PlayerRespawnEvent event) { // can be respawned in another world