From 2565fbde7804761da116f66c64f8f73c02d1cea9 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Sat, 19 Jan 2013 12:40:40 +0000 Subject: Negate 'groupmanager.noofflineperms' by default in the owner group. --- EssentialsGroupManager/src/Changelog.txt | 3 ++- EssentialsGroupManager/src/groups.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index bbdab6a4f..014b4b9ea 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -207,4 +207,5 @@ v 2.0: - Clear our attachment map upon a manload so we correctly reconfigure a players new permissions. - Synchronize the raising of GroupManager events to Bukkit.getServer() (should prevent deadlocks). - Synchronize pushing to Bukkit perms to prevent any ConcurrentModificationException. - - Do not grant any permissions (nor update Bukkit) if the server is in offline mode and the player has the permission node 'groupmanager.noofflineperms'. \ No newline at end of file + - Do not grant any permissions (nor update Bukkit) if the server is in offline mode and the player has the permission node 'groupmanager.noofflineperms'. + - Negate 'groupmanager.noofflineperms' by default in the owner group. \ No newline at end of file diff --git a/EssentialsGroupManager/src/groups.yml b/EssentialsGroupManager/src/groups.yml index 9c63ffd94..53c3a387e 100644 --- a/EssentialsGroupManager/src/groups.yml +++ b/EssentialsGroupManager/src/groups.yml @@ -65,6 +65,7 @@ groups: default: false permissions: - '*' + - -groupmanager.noofflineperms - -vanish.* inheritance: - admin -- cgit v1.2.3 From b86e02427ffecabbda482ea2e621a325adbbbe39 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Mon, 28 Jan 2013 04:13:16 +0000 Subject: Add support for BukkitForge using 'overworld' as the main world name. --- EssentialsGroupManager/src/Changelog.txt | 3 ++- .../dataholder/worlds/WorldsHolder.java | 22 +++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index 014b4b9ea..fe443e2a4 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -208,4 +208,5 @@ v 2.0: - Synchronize the raising of GroupManager events to Bukkit.getServer() (should prevent deadlocks). - Synchronize pushing to Bukkit perms to prevent any ConcurrentModificationException. - Do not grant any permissions (nor update Bukkit) if the server is in offline mode and the player has the permission node 'groupmanager.noofflineperms'. - - Negate 'groupmanager.noofflineperms' by default in the owner group. \ No newline at end of file + - Negate 'groupmanager.noofflineperms' by default in the owner group. + - Add support for BukkitForge using 'overworld' as the main world name. \ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java index 12a6a5150..2661c6bc0 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java @@ -477,14 +477,22 @@ public class WorldsHolder { private void verifyFirstRun() { - Properties server = new Properties(); - try { - server.load(new FileInputStream(new File("server.properties"))); - serverDefaultWorldName = server.getProperty("level-name").toLowerCase(); - setupWorldFolder(serverDefaultWorldName); - } catch (IOException ex) { - GroupManager.logger.log(Level.SEVERE, null, ex); + /* Do not use the folder name if this + * is a Bukkit Forge server. + */ + if (plugin.getServer().getName().equalsIgnoreCase("BukkitForge")) { + serverDefaultWorldName = "overworld"; + + } else { + Properties server = new Properties(); + try { + server.load(new FileInputStream(new File("server.properties"))); + serverDefaultWorldName = server.getProperty("level-name").toLowerCase(); + } catch (IOException ex) { + GroupManager.logger.log(Level.SEVERE, null, ex); + } } + setupWorldFolder(serverDefaultWorldName); } -- cgit v1.2.3 From 8fdf029007f760f87ddf80416f15314aaf528b32 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Tue, 29 Jan 2013 16:14:24 +0000 Subject: Prevent '*' permissions granting the 'groupmanager.noofflineperm' permission. --- EssentialsGroupManager/src/Changelog.txt | 3 ++- .../org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index fe443e2a4..c8d577945 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -209,4 +209,5 @@ v 2.0: - Synchronize pushing to Bukkit perms to prevent any ConcurrentModificationException. - Do not grant any permissions (nor update Bukkit) if the server is in offline mode and the player has the permission node 'groupmanager.noofflineperms'. - Negate 'groupmanager.noofflineperms' by default in the owner group. - - Add support for BukkitForge using 'overworld' as the main world name. \ No newline at end of file + - Add support for BukkitForge using 'overworld' as the main world name. + - Prevent '*' permissions granting the 'groupmanager.noofflineperm' permission. \ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java index 7396f3f70..a221c56a2 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java @@ -172,6 +172,8 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface { permArray.addAll(GroupManager.BukkitPermissions.getAllRegisteredPermissions(includeChildren)); allPerms = true; perms.remove("*"); + // Remove the no offline perms node as this should not be given. + perms.remove("groupmanager.noofflineperms"); } for (String perm : perms) { -- cgit v1.2.3 From fda048efca5e1708b5b38d7b65c1be7281437165 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Tue, 29 Jan 2013 16:15:45 +0000 Subject: Missed an S --- EssentialsGroupManager/src/Changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index c8d577945..edf179166 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -210,4 +210,4 @@ v 2.0: - Do not grant any permissions (nor update Bukkit) if the server is in offline mode and the player has the permission node 'groupmanager.noofflineperms'. - Negate 'groupmanager.noofflineperms' by default in the owner group. - Add support for BukkitForge using 'overworld' as the main world name. - - Prevent '*' permissions granting the 'groupmanager.noofflineperm' permission. \ No newline at end of file + - Prevent '*' permissions granting the 'groupmanager.noofflineperms' permission. \ No newline at end of file -- cgit v1.2.3 From e4dd3a28e47de6999131dcd28ebe78dd59c1f698 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Tue, 29 Jan 2013 16:33:20 +0000 Subject: Added '/mancheckw ' to inspect what permission files a world is referencing. --- EssentialsGroupManager/src/Changelog.txt | 3 ++- .../org/anjocaido/groupmanager/GroupManager.java | 28 +++++++++++++++++++++- .../utils/GroupManagerPermissions.java | 3 ++- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index edf179166..8a196d719 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -210,4 +210,5 @@ v 2.0: - Do not grant any permissions (nor update Bukkit) if the server is in offline mode and the player has the permission node 'groupmanager.noofflineperms'. - Negate 'groupmanager.noofflineperms' by default in the owner group. - Add support for BukkitForge using 'overworld' as the main world name. - - Prevent '*' permissions granting the 'groupmanager.noofflineperms' permission. \ No newline at end of file + - Prevent '*' permissions granting the 'groupmanager.noofflineperms' permission. + - Added '/mancheckw ' to inspect what permission files a world is referencing. \ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index 3236b9b84..9a1583d86 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -1895,7 +1895,7 @@ public class GroupManager extends JavaPlugin { case manselect: if (args.length < 1) { - sender.sendMessage(ChatColor.RED + "Review your arguments count! (/ )"); + sender.sendMessage(ChatColor.RED + "Review your arguments count! (/manselect )"); sender.sendMessage(ChatColor.YELLOW + "Worlds available: "); ArrayList worlds = worldsHolder.allWorldsDataList(); auxString = ""; @@ -1935,6 +1935,32 @@ public class GroupManager extends JavaPlugin { sender.sendMessage(ChatColor.YELLOW + "You have removed your world selection. Working with current world(if possible)."); return true; + + case mancheckw: + if (args.length < 1) { + sender.sendMessage(ChatColor.RED + "Review your arguments count! (/mancheckw )"); + sender.sendMessage(ChatColor.YELLOW + "Worlds available: "); + ArrayList worlds = worldsHolder.allWorldsDataList(); + auxString = ""; + for (int i = 0; i < worlds.size(); i++) { + auxString += worlds.get(i).getName(); + if ((i + 1) < worlds.size()) { + auxString += ", "; + } + } + sender.sendMessage(ChatColor.YELLOW + auxString); + return false; + } + + + dataHolder = worldsHolder.getWorldData(auxString); + + sender.sendMessage(ChatColor.YELLOW + "You have selected world '" + dataHolder.getName() + "'."); + sender.sendMessage(ChatColor.YELLOW + "This world is using the following data files.."); + sender.sendMessage(ChatColor.YELLOW + "Groups: " + dataHolder.getGroupsFile().getAbsolutePath()); + sender.sendMessage(ChatColor.YELLOW + "Users: " + dataHolder.getUsersFile().getAbsolutePath()); + + return true; default: break; diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/GroupManagerPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/GroupManagerPermissions.java index 4a7298b9c..020e4c6f1 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/GroupManagerPermissions.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/GroupManagerPermissions.java @@ -49,5 +49,6 @@ public enum GroupManagerPermissions { mantogglesave, manworld, manselect, - manclear + manclear, + mancheckw } -- cgit v1.2.3 From 7bb1fd2f771537da206509a1a562b170871cd628 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Tue, 29 Jan 2013 16:35:15 +0000 Subject: grammaaahhhh!!! --- EssentialsGroupManager/src/Changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index 8a196d719..dae50fd15 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -211,4 +211,4 @@ v 2.0: - Negate 'groupmanager.noofflineperms' by default in the owner group. - Add support for BukkitForge using 'overworld' as the main world name. - Prevent '*' permissions granting the 'groupmanager.noofflineperms' permission. - - Added '/mancheckw ' to inspect what permission files a world is referencing. \ No newline at end of file + - Added '/mancheckw ' to inspect which permission files a world is referencing. \ No newline at end of file -- cgit v1.2.3 From a51d1f11a62baf04ce134ede2fe40c24801343c4 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Tue, 29 Jan 2013 16:45:23 +0000 Subject: Update plugin.yml with the new command --- EssentialsGroupManager/src/plugin.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/EssentialsGroupManager/src/plugin.yml b/EssentialsGroupManager/src/plugin.yml index abe199aad..3aec73096 100644 --- a/EssentialsGroupManager/src/plugin.yml +++ b/EssentialsGroupManager/src/plugin.yml @@ -164,6 +164,10 @@ commands: description: Clear world selection. Next commands will work on your world. usage: / permissions: groupmanager.manclear + mancheckw: + description: Obtain the paths to each file a world is storing it's data in (users/groups). + usage: / + permissions: groupmanager.mancheckw Permissions: groupmanager.op: -- cgit v1.2.3 From 640a2bcc2d7d727a92b3bfb9fc8329bde7f02768 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Tue, 29 Jan 2013 16:56:03 +0000 Subject: Doh, actually find what world we want to check properly with mancheckw. --- .../src/org/anjocaido/groupmanager/GroupManager.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index 9a1583d86..050bd9995 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -1952,7 +1952,17 @@ public class GroupManager extends JavaPlugin { return false; } - + auxString = ""; + for (int i = 0; i < args.length; i++) { + if (args[i] == null) { + logger.warning("Bukkit gave invalid arguments array! Cmd: " + cmd.getName() + " args.length: " + args.length); + return false; + } + auxString += args[i]; + if (i < (args.length - 1)) { + auxString += " "; + } + } dataHolder = worldsHolder.getWorldData(auxString); sender.sendMessage(ChatColor.YELLOW + "You have selected world '" + dataHolder.getName() + "'."); -- cgit v1.2.3 From dc925f32c882ff86e6bb92b861957f5c562870a0 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Wed, 30 Jan 2013 18:15:58 +0200 Subject: update config.yml to include commandblock change --- EssentialsGroupManager/src/config.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/EssentialsGroupManager/src/config.yml b/EssentialsGroupManager/src/config.yml index cc90bea6f..bff472be0 100644 --- a/EssentialsGroupManager/src/config.yml +++ b/EssentialsGroupManager/src/config.yml @@ -7,6 +7,10 @@ settings: # Default setting for 'mantoglevalidate' # true will cause GroupManager to attempt name matching by default. validate_toggle: true + # *************************************************************************************************************** + # *** NOTE: Having this feature enabled, improper use of commandblocks will lead to server chaos, be alarmed! *** + # *************************************************************************************************************** + allow_commandblocks: false data: save: @@ -39,4 +43,4 @@ settings: # world4: # - groups (World4 would use the groups.yml from world2, but it's own users.yml) # world5: - # - world6 (this would cause world6 to mirror both files from world5) \ No newline at end of file + # - world6 (this would cause world6 to mirror both files from world5) -- cgit v1.2.3 From 689a8655ceeb38deacd94236ecb2dfa584f33f5a Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Wed, 30 Jan 2013 18:47:19 +0200 Subject: register new config setting --- .../src/org/anjocaido/groupmanager/GMConfiguration.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java index 4fcd0a554..e5a24258e 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java @@ -22,6 +22,7 @@ import org.yaml.snakeyaml.reader.UnicodeReader; */ public class GMConfiguration { + private boolean allowCommandBlocks = false; private boolean opOverride = true; private boolean toggleValidate = true; private Integer saveInterval = 10; @@ -40,6 +41,7 @@ public class GMConfiguration { /* * Set defaults */ + allowCommandBlocks = false; opOverride = true; toggleValidate = true; saveInterval = 10; @@ -83,6 +85,7 @@ public class GMConfiguration { try { Map config = getElement("config", getElement("settings", GMconfig)); + allowCommandBlocks = (Boolean) config.get("allow_commandblocks"); opOverride = (Boolean) config.get("opOverrides"); toggleValidate = (Boolean) config.get("validate_toggle"); @@ -142,6 +145,10 @@ public class GMConfiguration { return (Map) map.get(element); } + public boolean isAllowCommandBlocks() { + + return allowCommandBlocks; + } public boolean isOpOverride() { @@ -183,4 +190,4 @@ public class GMConfiguration { } -} \ No newline at end of file +} -- cgit v1.2.3 From 01aa20d7ef2414528753ffb7fa936cb3bba75f8a Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Wed, 30 Jan 2013 18:53:40 +0200 Subject: add allow commandblock check --- .../src/org/anjocaido/groupmanager/GroupManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index 050bd9995..b99bebf63 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -387,10 +387,11 @@ public class GroupManager extends JavaPlugin { Group senderGroup = null; User senderUser = null; boolean isOpOverride = config.isOpOverride(); + boolean isAllowCommandBlocks = config.isAllowCommandBlocks(); // PREVENT GM COMMANDS BEING USED ON COMMANDBLOCKS - if (sender instanceof BlockCommandSender) { - sender.sendMessage(ChatColor.RED + "GM Commands can not be called from CommandBlocks"); + if (sender instanceof BlockCommandSender && !isAllowCommandBlocks) { + console.sendMessage(ChatColor.RED + "GM Commands can not be called from CommandBlocks"); return true; } -- cgit v1.2.3 From e34eba0b570b20d04cc37928f68775c5ce6a7833 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Wed, 30 Jan 2013 19:14:57 +0200 Subject: update config description of allow_commmandblocks --- EssentialsGroupManager/src/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/EssentialsGroupManager/src/config.yml b/EssentialsGroupManager/src/config.yml index bff472be0..479399bb6 100644 --- a/EssentialsGroupManager/src/config.yml +++ b/EssentialsGroupManager/src/config.yml @@ -7,9 +7,9 @@ settings: # Default setting for 'mantoglevalidate' # true will cause GroupManager to attempt name matching by default. validate_toggle: true - # *************************************************************************************************************** - # *** NOTE: Having this feature enabled, improper use of commandblocks will lead to server chaos, be alarmed! *** - # *************************************************************************************************************** + # ********************************************************************************************************************************** + # *** NOTE: Having this feature enabled, improper use of commandblocks will lead to undesireable permission changes, be alarmed! *** + # ********************************************************************************************************************************** allow_commandblocks: false data: -- cgit v1.2.3 From 221c0e4b6e7ca134db30a80d9a7172446caea004 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Wed, 30 Jan 2013 19:25:35 +0200 Subject: update commandblock usage deny message --- .../src/org/anjocaido/groupmanager/GroupManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index b99bebf63..4a9b65317 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -391,7 +391,8 @@ public class GroupManager extends JavaPlugin { // PREVENT GM COMMANDS BEING USED ON COMMANDBLOCKS if (sender instanceof BlockCommandSender && !isAllowCommandBlocks) { - console.sendMessage(ChatColor.RED + "GM Commands can not be called from CommandBlocks"); + Block block = ((BlockCommandSender)sender).getBlock(); + console.sendMessage(ChatColor.RED + "GM Commands can not be called from CommandBlock at location:" + ChatColor.GREEN + " " + block.getX + ", " + block.getY + ", " + block.getZ); return true; } @@ -400,7 +401,7 @@ public class GroupManager extends JavaPlugin { senderPlayer = (Player) sender; if (!lastError.isEmpty() && !commandLabel.equalsIgnoreCase("manload")) { - sender.sendMessage(ChatColor.RED + "All commands are locked due to an error. " + ChatColor.BOLD + "" + ChatColor.UNDERLINE + "Check the log" + ChatColor.RESET + "" + ChatColor.RED + " and then try a '/manload'."); + GroupManager.logger.warning(ChatColor.RED + "All commands are locked due to an error. " + ChatColor.BOLD + "" + ChatColor.UNDERLINE + "Check the log" + ChatColor.RESET + "" + ChatColor.RED + " and then try a '/manload'."); return true; } -- cgit v1.2.3 From 1e658752ed821f762d83cf6aa327db11ce39fdbf Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Wed, 30 Jan 2013 19:26:46 +0200 Subject: update changelog --- EssentialsGroupManager/src/Changelog.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index dae50fd15..f3bc35baa 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -34,10 +34,10 @@ v 1.3: (for all worlds named in config.yml) - Attempt to stop GM wiping groups/users yml's on a bad shut down. - Added event handling to manage new world creation at runtime. - - Added the ability to handle unknown worlds at server start. - (GM will create the data files for any worlds it finds which are not in the config.yml) + - Added the ability to handle unknown worlds at server start. + (GM will create the data files for any worlds it finds which are not in the config.yml) - Fix for Bukkit passing a null To location on a player Portaling - - Fixed manudelsub not correctly selecting the group to remove. + - Fixed manudelsub not correctly selecting the group to remove. - Added two new permission nodes - groupmanager.notify.self & groupmanager.notify.other These allow players/admins to be notified when players are moved between groups. v 1.4: @@ -211,4 +211,5 @@ v 2.0: - Negate 'groupmanager.noofflineperms' by default in the owner group. - Add support for BukkitForge using 'overworld' as the main world name. - Prevent '*' permissions granting the 'groupmanager.noofflineperms' permission. - - Added '/mancheckw ' to inspect which permission files a world is referencing. \ No newline at end of file + - Added '/mancheckw ' to inspect which permission files a world is referencing. + - Add config potion to set if GM commands should be allowed on CommnandBlocks. -- cgit v1.2.3 From fb4a7a3bd67a149c9c6c2e3d03e60bd2ba7f6c89 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Wed, 30 Jan 2013 19:55:38 +0000 Subject: Fix Necrodooms broken code. --- .../src/org/anjocaido/groupmanager/GroupManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index 4a9b65317..a7b072145 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -34,6 +34,7 @@ import org.anjocaido.groupmanager.utils.Tasks; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.OfflinePlayer; +import org.bukkit.block.Block; import org.bukkit.command.BlockCommandSender; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -392,7 +393,7 @@ public class GroupManager extends JavaPlugin { // PREVENT GM COMMANDS BEING USED ON COMMANDBLOCKS if (sender instanceof BlockCommandSender && !isAllowCommandBlocks) { Block block = ((BlockCommandSender)sender).getBlock(); - console.sendMessage(ChatColor.RED + "GM Commands can not be called from CommandBlock at location:" + ChatColor.GREEN + " " + block.getX + ", " + block.getY + ", " + block.getZ); + GroupManager.logger.warning(ChatColor.RED + "GM Commands can not be called from the CommandBlock at location: " + ChatColor.GREEN + block.getWorld().getName() + " - " + block.getX() + ", " + block.getY() + ", " + block.getZ()); return true; } -- cgit v1.2.3