Skip to content

Commit

Permalink
Change world string methods
Browse files Browse the repository at this point in the history
  • Loading branch information
weaves7 committed Dec 26, 2021
1 parent e73bcdd commit b650bba
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.makershaven</groupId>
<artifactId>SignShop</artifactId>
<version>3.6.2</version>
<version>3.6.1.3-dev</version>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public boolean isOp(World world, String perm) {
if (isOpRaw())
return true;
String fullperm = (perm.isEmpty() ? "SignShop.SuperAdmin" : "SignShop.SuperAdmin." + perm);
return SignShop.usePermissions() && Vault.getPermission().playerHas(world.toString(), getOfflinePlayer(), fullperm.toLowerCase());
return SignShop.usePermissions() && Vault.getPermission().playerHas(world.getName(), getOfflinePlayer(), fullperm.toLowerCase());
}

private boolean isOpRaw() {
Expand Down Expand Up @@ -188,7 +188,7 @@ public boolean hasPerm(String perm, World world, Boolean OPOperation) {
setOp(false);
// Having Signshop.Superadmin while Permissions are in use should allow you to do everything with SignShop
// And since the node is explicitly given to a player, the OPOverride setting is not relevant
if (SignShop.usePermissions() && Vault.getPermission().playerHas(world.toString(), getOfflinePlayer(), "signshop.superadmin")) {
if (SignShop.usePermissions() && Vault.getPermission().playerHas(world.getName(), getOfflinePlayer(), "signshop.superadmin")) {
setOp(isOP);
return true;
}
Expand All @@ -197,7 +197,7 @@ public boolean hasPerm(String perm, World world, Boolean OPOperation) {
if (SignShop.usePermissions() && OPOverride && isOP)
return true;
// Using Permissions so check his permissions and restore his OP if he has it
else if (SignShop.usePermissions() && Vault.getPermission().playerHas(world.toString(), getOfflinePlayer(), perm.toLowerCase())) {
else if (SignShop.usePermissions() && Vault.getPermission().playerHas(world.getName(), getOfflinePlayer(), perm.toLowerCase())) {
setOp(isOP);
return true;
// Not using Permissions but he is OP, so he's allowed
Expand Down

0 comments on commit b650bba

Please sign in to comment.