minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-01 20:30:48 +02:00
Code Issues Releases Wiki Activity

Fix Overloaded and non-overloaded users to report correctly for group tests.

Browse Source
This commit is contained in:
ElgarL
2014-07-08 18:03:21 +01:00
parent 4097ef4939
commit d32c692b66
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
EssentialsGroupManager/src/Changelog.txt
View File

@@ -235,3 +235,4 @@ v2.1:
- Prevent GM's own permission tests from allowing inherited permissions to override inherited negations (caused when we added the exception override for sub groups). - Prevent GM's own permission tests from allowing inherited permissions to override inherited negations (caused when we added the exception override for sub groups).
- Add internal name to UUID resolution to speed data lookups. - Add internal name to UUID resolution to speed data lookups.
- Convert all User lookups and commands to use UUIDs where possible. - Convert all User lookups and commands to use UUIDs where possible.
- Fix Overloaded and non-overloaded users to report correctly for group tests.

14
EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
View File

@@ -1632,8 +1632,8 @@ public class GroupManager extends JavaPlugin {
sender.sendMessage(ChatColor.YELLOW + "subgroups: " + auxString); sender.sendMessage(ChatColor.YELLOW + "subgroups: " + auxString);
} }
sender.sendMessage(ChatColor.YELLOW + "Overloaded: " + ChatColor.GREEN + dataHolder.isOverloaded(auxUser.getLastName())); sender.sendMessage(ChatColor.YELLOW + "Overloaded: " + ChatColor.GREEN + dataHolder.isOverloaded(auxUser.getUUID()));
auxGroup = dataHolder.surpassOverload(auxUser.getLastName()).getGroup(); auxGroup = dataHolder.surpassOverload(auxUser.getUUID()).getGroup();
if (!auxGroup.equals(auxUser.getGroup())) { if (!auxGroup.equals(auxUser.getGroup())) {
sender.sendMessage(ChatColor.YELLOW + "Original Group: " + ChatColor.GREEN + auxGroup.getName()); sender.sendMessage(ChatColor.YELLOW + "Original Group: " + ChatColor.GREEN + auxGroup.getName());
} }
@@ -1668,7 +1668,7 @@ public class GroupManager extends JavaPlugin {
if (overloadedUsers.get(dataHolder.getName().toLowerCase()) == null) { if (overloadedUsers.get(dataHolder.getName().toLowerCase()) == null) {
overloadedUsers.put(dataHolder.getName().toLowerCase(), new ArrayList<User>()); overloadedUsers.put(dataHolder.getName().toLowerCase(), new ArrayList<User>());
} }
dataHolder.overloadUser(auxUser.getLastName()); dataHolder.overloadUser(auxUser.getUUID());
overloadedUsers.get(dataHolder.getName().toLowerCase()).add(dataHolder.getUser(auxUser.getUUID())); overloadedUsers.get(dataHolder.getName().toLowerCase()).add(dataHolder.getUser(auxUser.getUUID()));
sender.sendMessage(ChatColor.YELLOW + "Player set to overload mode!"); sender.sendMessage(ChatColor.YELLOW + "Player set to overload mode!");
@@ -1702,7 +1702,7 @@ public class GroupManager extends JavaPlugin {
if (overloadedUsers.get(dataHolder.getName().toLowerCase()) == null) { if (overloadedUsers.get(dataHolder.getName().toLowerCase()) == null) {
overloadedUsers.put(dataHolder.getName().toLowerCase(), new ArrayList<User>()); overloadedUsers.put(dataHolder.getName().toLowerCase(), new ArrayList<User>());
} }
dataHolder.removeOverload(auxUser.getLastName()); dataHolder.removeOverload(auxUser.getUUID());
if (overloadedUsers.get(dataHolder.getName().toLowerCase()).contains(auxUser)) { if (overloadedUsers.get(dataHolder.getName().toLowerCase()).contains(auxUser)) {
overloadedUsers.get(dataHolder.getName().toLowerCase()).remove(auxUser); overloadedUsers.get(dataHolder.getName().toLowerCase()).remove(auxUser);
} }
@@ -1721,7 +1721,7 @@ public class GroupManager extends JavaPlugin {
removeList = new ArrayList<User>(); removeList = new ArrayList<User>();
count = 0; count = 0;
for (User u : overloadedUsers.get(dataHolder.getName().toLowerCase())) { for (User u : overloadedUsers.get(dataHolder.getName().toLowerCase())) {
if (!dataHolder.isOverloaded(u.getLastName())) { if (!dataHolder.isOverloaded(u.getUUID())) {
removeList.add(u); removeList.add(u);
} else { } else {
auxString += u.getLastName() + ", "; auxString += u.getLastName() + ", ";
@@ -1751,8 +1751,8 @@ public class GroupManager extends JavaPlugin {
removeList = new ArrayList<User>(); removeList = new ArrayList<User>();
count = 0; count = 0;
for (User u : overloadedUsers.get(dataHolder.getName().toLowerCase())) { for (User u : overloadedUsers.get(dataHolder.getName().toLowerCase())) {
if (dataHolder.isOverloaded(u.getLastName())) { if (dataHolder.isOverloaded(u.getUUID())) {
dataHolder.removeOverload(u.getLastName()); dataHolder.removeOverload(u.getUUID());
count++; count++;
} }
} }

6
EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java
View File

@@ -41,16 +41,16 @@ public class OverloadedWorldHolder extends WorldDataHolder {
* @return user object or a new user if none exists. * @return user object or a new user if none exists.
*/ */
@Override @Override
public User getUser(String userName) { public User getUser(String userId) {
//OVERLOADED CODE //OVERLOADED CODE
String userNameLowered = userName.toLowerCase(); String userNameLowered = userId.toLowerCase();
if (overloadedUsers.containsKey(userNameLowered)) { if (overloadedUsers.containsKey(userNameLowered)) {
return overloadedUsers.get(userNameLowered); return overloadedUsers.get(userNameLowered);
} }
//END CODE //END CODE
return super.getUser(userName); return super.getUser(userId);
} }
/** /**