TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-04-27 08:59:45 +00:00
Code Issues Projects Releases Wiki Activity

- Invalid groups assigned to players in users.yml will no longer cause

Browse source 
a crash. GM will now set them to the default group instead.
This commit is contained in:
ElgarL 2011-09-03 15:29:44 +01:00
parent 80491513a2
commit e2024ca2b6
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
EssentialsGroupManager/src/Changelog.txt
View file

@ -5,3 +5,4 @@ v 1.1:
- Added SuperPerms support so GM will update and provide the permissions to plugins which only support Bukkit Perms. - Added SuperPerms support so GM will update and provide the permissions to plugins which only support Bukkit Perms.
- Added more helpful output to errors on argument lengths. - Added more helpful output to errors on argument lengths.
- GroupManager will now attempt to select the default world when using commands instead of failing and telling you to use '/manselect <world>'. - GroupManager will now attempt to select the default world when using commands instead of failing and telling you to use '/manselect <world>'.
- Invalid groups assigned to players in users.yml will no longer cause a crash. GM will now set them to the default group instead.

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

@ -55,6 +55,10 @@ public class GroupManager extends JavaPlugin {
public static BukkitPermissions BukkitPermissions; public static BukkitPermissions BukkitPermissions;
public static final Logger logger = Logger.getLogger(GroupManager.class.getName()); public static final Logger logger = Logger.getLogger(GroupManager.class.getName());
//PERMISSIONS FOR COMMAND BEING LOADED
OverloadedWorldHolder dataHolder = null;
AnjoPermissionsHandler permissionHandler = null;
@Override @Override
public void onDisable() { public void onDisable() {
isLoaded = false; isLoaded = false;
@ -222,8 +226,8 @@ public class GroupManager extends JavaPlugin {
} }
//PERMISSIONS FOR COMMAND BEING LOADED //PERMISSIONS FOR COMMAND BEING LOADED
OverloadedWorldHolder dataHolder = null; dataHolder = null;
AnjoPermissionsHandler permissionHandler = null; permissionHandler = null;
if (senderPlayer != null) { if (senderPlayer != null) {
dataHolder = worldsHolder.getWorldData(senderPlayer); dataHolder = worldsHolder.getWorldData(senderPlayer);
@ -1624,10 +1628,6 @@ public class GroupManager extends JavaPlugin {
*/ */
private boolean setDefaultWorldHandler(CommandSender sender) { private boolean setDefaultWorldHandler(CommandSender sender) {
//PERMISSIONS FOR COMMAND BEING LOADED
OverloadedWorldHolder dataHolder = null;
AnjoPermissionsHandler permissionHandler = null;
dataHolder = worldsHolder.getWorldData(worldsHolder.getDefaultWorld().getName()); dataHolder = worldsHolder.getWorldData(worldsHolder.getDefaultWorld().getName());
permissionHandler = dataHolder.getPermissionsHandler(); permissionHandler = dataHolder.getPermissionsHandler();
selectedWorlds.put(sender, dataHolder.getName()); selectedWorlds.put(sender, dataHolder.getName());

4
EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java Executable file → Normal file
View file

@ -630,7 +630,9 @@ public class WorldDataHolder {
if (thisUserNode.get("group") != null) { if (thisUserNode.get("group") != null) {
Group hisGroup = ph.getGroup(thisUserNode.get("group").toString()); Group hisGroup = ph.getGroup(thisUserNode.get("group").toString());
if (hisGroup == null) { if (hisGroup == null) {
throw new IllegalArgumentException("There is no group " + thisUserNode.get("group").toString() + ", as stated for player " + thisUser.getName()); GroupManager.logger.warning("There is no group " + thisUserNode.get("group").toString() + ", as stated for player " + thisUser.getName() + ": Set to '" + ph.getDefaultGroup().getName() + "'.");
hisGroup = ph.defaultGroup;
//throw new IllegalArgumentException("There is no group " + thisUserNode.get("group").toString() + ", as stated for player " + thisUser.getName());
} }
thisUser.setGroup(hisGroup); thisUser.setGroup(hisGroup);
} else { } else {