minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-22 14:23:09 +02:00
Code Issues Releases Wiki Activity

2.9 3.0 merge

Browse Source 
Fix permissions checks
This commit is contained in:
ementalo
2012-05-29 22:20:52 +01:00
parent a8af0a9259
commit 0af4103b92
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Essentials/src/com/earth2me/essentials/utils/Util.java
View File

@@ -7,6 +7,7 @@ import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.api.InvalidNameException; import com.earth2me.essentials.api.InvalidNameException;
import com.earth2me.essentials.utils.gnu.inet.encoding.Punycode; import com.earth2me.essentials.utils.gnu.inet.encoding.Punycode;
import com.earth2me.essentials.utils.gnu.inet.encoding.PunycodeException; import com.earth2me.essentials.utils.gnu.inet.encoding.PunycodeException;
import de.bananaco.bpermissions.imp.Permissions;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols; import java.text.DecimalFormatSymbols;
import java.util.Collection; import java.util.Collection;
@@ -383,7 +384,7 @@ public final class Util
return null; return null;
} }
String message; String message;
if (user.isAuthorized(permBase + ".color")) if (Permissions.hasPermission(user.getBase(), permBase + ".color"))
{ {
message = Util.replaceColor(input, REPLACE_COLOR_PATTERN); message = Util.replaceColor(input, REPLACE_COLOR_PATTERN);
} }
@@ -391,7 +392,7 @@ public final class Util
{ {
message = Util.stripColor(input, VANILLA_COLOR_PATTERN); message = Util.stripColor(input, VANILLA_COLOR_PATTERN);
} }
if (user.isAuthorized(permBase + ".magic")) if (Permissions.hasPermission(user.getBase(), permBase + ".magic"))
{ {
message = Util.replaceColor(message, REPLACE_MAGIC_PATTERN); message = Util.replaceColor(message, REPLACE_MAGIC_PATTERN);
} }
@@ -399,7 +400,7 @@ public final class Util
{ {
message = Util.stripColor(message, VANILLA_MAGIC_PATTERN); message = Util.stripColor(message, VANILLA_MAGIC_PATTERN);
} }
if (user.isAuthorized(permBase + ".format")) if (Permissions.hasPermission(user.getBase(), permBase + ".format"))
{ {
message = Util.replaceColor(message, REPLACE_FORMAT_PATTERN); message = Util.replaceColor(message, REPLACE_FORMAT_PATTERN);
} }
@@ -417,7 +418,7 @@ public final class Util
return null; return null;
} }
String message = formatString(user, permBase, input); String message = formatString(user, permBase, input);
if (!user.isAuthorized(permBase + ".url")) if (!Permissions.hasPermission(user.getBase(), permBase + ".url"))
{ {
message = Util.blockURL(message); message = Util.blockURL(message);
} }