mirror of
https://github.com/EssentialsX/Essentials.git
synced 2024-09-06 04:58:00 +02:00
Merge remote branch 'remotes/ess/groupmanager' into essmaster
This commit is contained in:
commit
3177f25eb6
@ -13,4 +13,6 @@ v 1.1:
|
||||
- Push updates to superperms for all valid GM commands.
|
||||
- All GroupManager commands issued by players are now echoed in the console.
|
||||
- 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.
|
@ -1423,9 +1423,14 @@ public class GroupManager extends JavaPlugin {
|
||||
auxString += " ";
|
||||
}
|
||||
}
|
||||
|
||||
isLoaded = false; // Disable Bukkit Perms update
|
||||
|
||||
worldsHolder.loadWorld(auxString);
|
||||
sender.sendMessage("The request to world '" + auxString + "' was sent.");
|
||||
|
||||
isLoaded = true;
|
||||
|
||||
BukkitPermissions.updateAllPlayers();
|
||||
|
||||
return true;
|
||||
|
@ -195,11 +195,9 @@ public class BukkitPermissions {
|
||||
|
||||
@Override
|
||||
public void onPlayerPortal(PlayerPortalEvent event) { // will portal into another world
|
||||
if(event.getPlayer().getWorld().equals(event.getTo().getWorld())){ // only if world actually changed
|
||||
return;
|
||||
if(!event.getFrom().getWorld().equals(event.getTo().getWorld())){ // only if world actually changed
|
||||
updatePermissions(event.getPlayer(), event.getTo().getWorld().getName());
|
||||
}
|
||||
|
||||
updatePermissions(event.getPlayer(), event.getTo().getWorld().getName());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Loading…
Reference in New Issue
Block a user