twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-27 02:13:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

BUILDTOOLS-251: Make much of Bukkit locale independent

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2016-06-26 19:31:59 +10:00
parent b54985de63
commit 7f7f1608e8
17 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
paper-api/src/main/java/org/bukkit/permissions/PermissibleBase.java
View File

@@ -50,7 +50,7 @@ public class PermissibleBase implements Permissible {
throw new IllegalArgumentException("Permission name cannot be null");
}
return permissions.containsKey(name.toLowerCase());
return permissions.containsKey(name.toLowerCase(java.util.Locale.ENGLISH));
}
public boolean isPermissionSet(Permission perm) {
@@ -66,7 +66,7 @@ public class PermissibleBase implements Permissible {
throw new IllegalArgumentException("Permission name cannot be null");
}
String name = inName.toLowerCase();
String name = inName.toLowerCase(java.util.Locale.ENGLISH);
if (isPermissionSet(name)) {
return permissions.get(name).getValue();
@@ -86,7 +86,7 @@ public class PermissibleBase implements Permissible {
throw new IllegalArgumentException("Permission cannot be null");
}
String name = perm.getName().toLowerCase();
String name = perm.getName().toLowerCase(java.util.Locale.ENGLISH);
if (isPermissionSet(name)) {
return permissions.get(name).getValue();
@@ -151,7 +151,7 @@ public class PermissibleBase implements Permissible {
Bukkit.getServer().getPluginManager().subscribeToDefaultPerms(isOp(), parent);
for (Permission perm : defaults) {
String name = perm.getName().toLowerCase();
String name = perm.getName().toLowerCase(java.util.Locale.ENGLISH);
permissions.put(name, new PermissionAttachmentInfo(parent, name, null, true));
Bukkit.getServer().getPluginManager().subscribeToPermission(name, parent);
calculateChildPermissions(perm.getChildren(), false, null);
@@ -181,7 +181,7 @@ public class PermissibleBase implements Permissible {
for (String name : keys) {
Permission perm = Bukkit.getServer().getPluginManager().getPermission(name);
boolean value = children.get(name) ^ invert;
String lname = name.toLowerCase();
String lname = name.toLowerCase(java.util.Locale.ENGLISH);
permissions.put(lname, new PermissionAttachmentInfo(parent, lname, attachment, value));
Bukkit.getServer().getPluginManager().subscribeToPermission(name, parent);

2
paper-api/src/main/java/org/bukkit/permissions/Permission.java
View File

@@ -181,7 +181,7 @@ public class Permission {
*/
public Permission addParent(String name, boolean value) {
PluginManager pm = Bukkit.getServer().getPluginManager();
String lname = name.toLowerCase();
String lname = name.toLowerCase(java.util.Locale.ENGLISH);
Permission perm = pm.getPermission(lname);

4
paper-api/src/main/java/org/bukkit/permissions/PermissionAttachment.java
View File

@@ -83,7 +83,7 @@ public class PermissionAttachment {
* @param value New value of the permission
*/
public void setPermission(String name, boolean value) {
permissions.put(name.toLowerCase(), value);
permissions.put(name.toLowerCase(java.util.Locale.ENGLISH), value);
permissible.recalculatePermissions();
}
@@ -106,7 +106,7 @@ public class PermissionAttachment {
* @param name Name of the permission to remove
*/
public void unsetPermission(String name) {
permissions.remove(name.toLowerCase());
permissions.remove(name.toLowerCase(java.util.Locale.ENGLISH));
permissible.recalculatePermissions();
}

2
paper-api/src/main/java/org/bukkit/permissions/PermissionDefault.java
View File

@@ -48,7 +48,7 @@ public enum PermissionDefault {
* @return Specified value, or null if not found
*/
public static PermissionDefault getByName(String name) {
return lookup.get(name.toLowerCase().replaceAll("[^a-z!]", ""));
return lookup.get(name.toLowerCase(java.util.Locale.ENGLISH).replaceAll("[^a-z!]", ""));
}
@Override