mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2024-10-28 00:02:29 +00:00
A command of '/manload' with no world arguments now performs a full
reload of GM.
This commit is contained in:
parent
3fc6bb4e4f
commit
3d1c0fd157
|
@ -141,3 +141,4 @@ v 1.9:
|
||||||
- Change Service registration to register WorldsHolder instead of AnjoPermissionsHandler. This is the correct entry point for all data.
|
- Change Service registration to register WorldsHolder instead of AnjoPermissionsHandler. This is the correct entry point for all data.
|
||||||
- Depreciate PlayerTeleportEvent, PlayerRespawnEvent and PlayerPortalEvent as it's all handled in PlayerChangedWorldEvent.
|
- Depreciate PlayerTeleportEvent, PlayerRespawnEvent and PlayerPortalEvent as it's all handled in PlayerChangedWorldEvent.
|
||||||
This also means we no longer update permissions before we change worlds.
|
This also means we no longer update permissions before we change worlds.
|
||||||
|
- A command of '/manload' with no world arguments now performs a full reload of GM.
|
|
@ -25,7 +25,10 @@ import java.util.concurrent.TimeUnit;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import org.anjocaido.groupmanager.dataholder.worlds.WorldsHolder;
|
import org.anjocaido.groupmanager.dataholder.worlds.WorldsHolder;
|
||||||
|
import org.anjocaido.groupmanager.events.GMSystemEvent;
|
||||||
import org.anjocaido.groupmanager.events.GMWorldListener;
|
import org.anjocaido.groupmanager.events.GMWorldListener;
|
||||||
|
import org.anjocaido.groupmanager.events.GroupManagerEventHandler;
|
||||||
|
import org.anjocaido.groupmanager.events.GMGroupEvent.Action;
|
||||||
import org.anjocaido.groupmanager.utils.GMLoggerHandler;
|
import org.anjocaido.groupmanager.utils.GMLoggerHandler;
|
||||||
import org.anjocaido.groupmanager.utils.PermissionCheckResult;
|
import org.anjocaido.groupmanager.utils.PermissionCheckResult;
|
||||||
import org.anjocaido.groupmanager.utils.Tasks;
|
import org.anjocaido.groupmanager.utils.Tasks;
|
||||||
|
@ -1492,7 +1495,9 @@ public class GroupManager extends JavaPlugin {
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case manload:
|
case manload:
|
||||||
// THIS CASE DONT NEED SENDER
|
/**
|
||||||
|
* Attempt to reload a specific world
|
||||||
|
*/
|
||||||
if (args.length > 0) {
|
if (args.length > 0) {
|
||||||
auxString = "";
|
auxString = "";
|
||||||
for (int i = 0; i < args.length; i++) {
|
for (int i = 0; i < args.length; i++) {
|
||||||
|
@ -1502,51 +1507,34 @@ public class GroupManager extends JavaPlugin {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
isLoaded = false; // Disable Bukkit Perms update
|
isLoaded = false; // Disable Bukkit Perms update and event triggers
|
||||||
|
|
||||||
globalGroups.load();
|
globalGroups.load();
|
||||||
worldsHolder.loadWorld(auxString);
|
worldsHolder.loadWorld(auxString);
|
||||||
|
|
||||||
sender.sendMessage("The request to world '" + auxString + "' was sent.");
|
sender.sendMessage("The request to reload world '" + auxString + "' was attempted.");
|
||||||
|
|
||||||
isLoaded = true;
|
isLoaded = true;
|
||||||
|
|
||||||
BukkitPermissions.updateAllPlayers();
|
BukkitPermissions.updateAllPlayers();
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
// VALIDANDO ESTADO DO SENDER
|
|
||||||
if (dataHolder == null || permissionHandler == null) {
|
|
||||||
if (!setDefaultWorldHandler(sender))
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
// WORKING
|
|
||||||
config.load();
|
|
||||||
globalGroups.load();
|
|
||||||
worldsHolder.mirrorSetUp();
|
|
||||||
|
|
||||||
isLoaded = false;
|
|
||||||
|
|
||||||
if (args.length > 0) {
|
|
||||||
auxString = "";
|
|
||||||
for (int i = 0; i < args.length; i++) {
|
|
||||||
auxString += args[i];
|
|
||||||
if ((i + 1) < args.length) {
|
|
||||||
auxString += " ";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
worldsHolder.loadWorld(auxString);
|
|
||||||
sender.sendMessage("The request to world '" + auxString + "' was sent.");
|
|
||||||
} else {
|
} else {
|
||||||
worldsHolder.reloadAll();
|
|
||||||
sender.sendMessage(ChatColor.YELLOW + " All worlds were reloaded.");
|
/**
|
||||||
|
* Reload all settings and data as no world was specified.
|
||||||
|
*/
|
||||||
|
onDisable();
|
||||||
|
onEnable();
|
||||||
}
|
}
|
||||||
|
|
||||||
isLoaded = true;
|
/**
|
||||||
|
* Fire an event as none will have been triggered in the reload.
|
||||||
BukkitPermissions.updateAllPlayers();
|
*/
|
||||||
|
if (GroupManager.isLoaded())
|
||||||
|
GroupManagerEventHandler.callEvent(GMSystemEvent.Action.RELOADED);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case listgroups:
|
case listgroups:
|
||||||
// VALIDANDO ESTADO DO SENDER
|
// VALIDANDO ESTADO DO SENDER
|
||||||
if (dataHolder == null || permissionHandler == null) {
|
if (dataHolder == null || permissionHandler == null) {
|
||||||
|
|
Loading…
Reference in a new issue