Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-10-01 16:17:30 +02:00
Code Issues Projects Releases Wiki Activity

Make getPermissionPrefix consistent

Browse Source 
https://github.com/BentoBoxWorld/BentoBox/issues/870
This commit is contained in:
tastybento 2019-07-29 12:00:45 -07:00
parent fb86a25a5e
commit 5de285249f
19 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/world/bentobox/bentobox/api/flags/FlagListener.java
View File

@ -154,8 +154,8 @@ public abstract class FlagListener implements Listener {
// Protection flag
// Ops or "bypass everywhere" moderators can do anything
if (user.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + ".mod.bypassprotect")
|| user.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + ".mod.bypass." + flag.getID() + ".everywhere")) {
if (user.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + "mod.bypassprotect")
|| user.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + "mod.bypass." + flag.getID() + ".everywhere")) {
if (user.isOp()) {
report(user, e, loc, flag, Why.OP);
} else {
@ -183,7 +183,7 @@ public abstract class FlagListener implements Listener {
if (island.get().isAllowed(user, flag)) {
report(user, e, loc, flag, Why.RANK_ALLOWED);
return true;
} else if (user.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + ".mod.bypass." + flag.getID() + ".island")) {
} else if (user.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + "mod.bypass." + flag.getID() + ".island")) {
report(user, e, loc, flag, Why.BYPASS_ISLAND);
return true;
}

4
src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClick.java
View File

@ -60,8 +60,8 @@ public class CycleClick implements PanelItem.ClickHandler {
user.sendMessage("general.errors.wrong-world");
return true;
}
String reqPerm = plugin.getIWM().getPermissionPrefix(Util.getWorld(user.getWorld())) + ".settings." + id;
String allPerms = plugin.getIWM().getPermissionPrefix(Util.getWorld(user.getWorld())) + ".settings.*";
String reqPerm = plugin.getIWM().getPermissionPrefix(Util.getWorld(user.getWorld())) + "settings." + id;
String allPerms = plugin.getIWM().getPermissionPrefix(Util.getWorld(user.getWorld())) + "settings.*";
if (!user.hasPermission(reqPerm) && !user.hasPermission(allPerms)) {
user.sendMessage("general.errors.no-permission", TextVariables.PERMISSION, reqPerm);
user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F);

2
src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClick.java
View File

@ -38,7 +38,7 @@ public class IslandToggleClick implements ClickHandler {
user.sendMessage("general.errors.wrong-world");
return true;
}
String reqPerm = plugin.getIWM().getPermissionPrefix(Util.getWorld(user.getWorld())) + ".settings." + id;
String reqPerm = plugin.getIWM().getPermissionPrefix(Util.getWorld(user.getWorld())) + "settings." + id;
if (!user.hasPermission(reqPerm)) {
user.sendMessage("general.errors.no-permission", TextVariables.PERMISSION, reqPerm);
user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F);

2
src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClick.java
View File

@ -37,7 +37,7 @@ public class WorldToggleClick implements ClickHandler {
user.sendMessage("general.errors.wrong-world");
return true;
}
String reqPerm = plugin.getIWM().getPermissionPrefix(Util.getWorld(user.getWorld())) + ".admin.world.settings." + id;
String reqPerm = plugin.getIWM().getPermissionPrefix(Util.getWorld(user.getWorld())) + "admin.world.settings." + id;
if (!user.hasPermission(reqPerm)) {
user.sendMessage("general.errors.no-permission", TextVariables.PERMISSION, reqPerm);
user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F);

2
src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandRankClickListener.java
View File

@ -42,7 +42,7 @@ public class CommandRankClickListener implements ClickHandler {
return true;
}
IslandWorldManager iwm = plugin.getIWM();
String reqPerm = iwm.getPermissionPrefix(Util.getWorld(user.getWorld())) + ".admin.settings.COMMAND_RANKS";
String reqPerm = iwm.getPermissionPrefix(Util.getWorld(user.getWorld())) + "admin.settings.COMMAND_RANKS";
if (!user.hasPermission(reqPerm)) {
user.sendMessage("general.errors.no-permission", "[permission]", reqPerm);
user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F);

2
src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoLimitClickListener.java
View File

@ -45,7 +45,7 @@ public class GeoLimitClickListener implements ClickHandler {
return true;
}
IslandWorldManager iwm = BentoBox.getInstance().getIWM();
String reqPerm = iwm.getPermissionPrefix(Util.getWorld(user.getWorld())) + ".admin.settings.GEO_LIMIT_MOBS";
String reqPerm = iwm.getPermissionPrefix(Util.getWorld(user.getWorld())) + "admin.settings.GEO_LIMIT_MOBS";
if (!user.hasPermission(reqPerm)) {
user.sendMessage("general.errors.no-permission", "[permission]", reqPerm);
user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F);

4
src/main/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListener.java
View File

@ -111,10 +111,10 @@ public class LockAndBanListener extends FlagListener {
return getIslands().getProtectedIslandAt(loc)
.map(is -> {
if (is.isBanned(player.getUniqueId())) {
return player.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + ".mod.bypassban") ? CheckResult.OPEN : CheckResult.BANNED;
return player.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + "mod.bypassban") ? CheckResult.OPEN : CheckResult.BANNED;
}
if (!is.isAllowed(User.getInstance(player), Flags.LOCK)) {
return player.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + ".mod.bypasslock") ? CheckResult.OPEN : CheckResult.LOCKED;
return player.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + "mod.bypasslock") ? CheckResult.OPEN : CheckResult.LOCKED;
}
return CheckResult.OPEN;
}).orElse(CheckResult.OPEN);

2
src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnderChestListener.java
View File

@ -37,7 +37,7 @@ public class EnderChestListener extends FlagListener {
if (type.equals(Material.ENDER_CHEST)
&& getIWM().inWorld(player.getLocation())
&& !player.isOp()
&& !player.hasPermission(getPlugin().getIWM().getPermissionPrefix(player.getWorld()) + ".craft.enderchest")
&& !player.hasPermission(getPlugin().getIWM().getPermissionPrefix(player.getWorld()) + "craft.enderchest")
&& !Flags.ENDER_CHEST.isSetForWorld(player.getWorld())) {
// Not allowed
User user = User.getInstance(player);

2
src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListener.java
View File

@ -40,7 +40,7 @@ public class InvincibleVisitorsListener extends FlagListener implements ClickHan
user.sendMessage("general.errors.wrong-world");
return true;
}
String reqPerm = getIWM().getPermissionPrefix(Util.getWorld(user.getWorld())) + ".admin.settings.INVINCIBLE_VISITORS";
String reqPerm = getIWM().getPermissionPrefix(Util.getWorld(user.getWorld())) + "admin.settings.INVINCIBLE_VISITORS";
if (!user.hasPermission(reqPerm)) {
user.sendMessage("general.errors.no-permission", "[permission]", reqPerm);
user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F);

7
src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java
View File

@ -483,14 +483,13 @@ public class IslandWorldManager {
}
/**
* Get the permission prefix for this world. No trailing dot included.
* Get the permission prefix for this world. Trailing dot included.
*
* @param world
* - world
* @param world - world
* @return permission prefix for this world
*/
public String getPermissionPrefix(@NonNull World world) {
return gameModes.get(world).getWorldSettings().getPermissionPrefix();
return gameModes.get(world).getWorldSettings().getPermissionPrefix() + ".";
}

2
src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClickTest.java
View File

@ -204,7 +204,7 @@ public class CycleClickTest {
when(plugin.getIWM()).thenReturn(iwm);
when(iwm.inWorld(any(World.class))).thenReturn(true);
when(iwm.inWorld(any(Location.class))).thenReturn(true);
when(iwm.getPermissionPrefix(any())).thenReturn("bskyblock");
when(iwm.getPermissionPrefix(any())).thenReturn("bskyblock.");
// Util
PowerMockito.mockStatic(Util.class);

2
src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClickTest.java
View File

@ -73,7 +73,7 @@ public class IslandToggleClickTest {
iwm = mock(IslandWorldManager.class);
when(iwm.inWorld(any(World.class))).thenReturn(true);
when(iwm.inWorld(any(Location.class))).thenReturn(true);
when(iwm.getPermissionPrefix(any())).thenReturn("bskyblock");
when(iwm.getPermissionPrefix(any())).thenReturn("bskyblock.");
when(plugin.getIWM()).thenReturn(iwm);
listener = new IslandToggleClick("test");

2
src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClickTest.java
View File

@ -65,7 +65,7 @@ public class WorldToggleClickTest {
// Island World Manager
when(iwm.inWorld(any(World.class))).thenReturn(true);
when(iwm.inWorld(any(Location.class))).thenReturn(true);
when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock");
when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock.");
Optional<GameModeAddon> optionalAddon = Optional.of(addon);
when(iwm.getAddon(Mockito.any())).thenReturn(optionalAddon);
when(plugin.getIWM()).thenReturn(iwm);

2
src/test/java/world/bentobox/bentobox/listeners/BannedVisitorCommandsTest.java
View File

@ -56,7 +56,7 @@ public class BannedVisitorCommandsTest {
iwm = mock(IslandWorldManager.class);
when(iwm.inWorld(any(World.class))).thenReturn(true);
when(iwm.inWorld(any(Location.class))).thenReturn(true);
when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock");
when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock.");
when(iwm.getVisitorBannedCommands(Mockito.any())).thenReturn(new ArrayList<>());
when(plugin.getIWM()).thenReturn(iwm);

2
src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java
View File

@ -47,7 +47,7 @@ public class DeathListenerTest {
iwm = mock(IslandWorldManager.class);
when(iwm.inWorld(any(World.class))).thenReturn(true);
when(iwm.inWorld(any(Location.class))).thenReturn(true);
when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock");
when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock.");
when(iwm.getVisitorBannedCommands(Mockito.any())).thenReturn(new ArrayList<>());
when(plugin.getIWM()).thenReturn(iwm);

2
src/test/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListenerTest.java
View File

@ -80,7 +80,7 @@ public class LockAndBanListenerTest {
// Island world manager
IslandWorldManager iwm = mock(IslandWorldManager.class);
when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock");
when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock.");
when(plugin.getIWM()).thenReturn(iwm);

2
src/test/java/world/bentobox/bentobox/listeners/flags/settings/PVPListenerTest.java
View File

@ -110,7 +110,7 @@ public class PVPListenerTest {
iwm = mock(IslandWorldManager.class);
when(iwm.inWorld(any(World.class))).thenReturn(true);
when(iwm.inWorld(any(Location.class))).thenReturn(true);
when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock");
when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock.");
// No visitor protection right now
when(iwm.getIvSettings(Mockito.any())).thenReturn(new ArrayList<>());
when(plugin.getIWM()).thenReturn(iwm);

2
src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListenerTest.java
View File

@ -83,7 +83,7 @@ public class InvincibleVisitorsListenerTest {
// Island World Manager
when(iwm.inWorld(any(World.class))).thenReturn(true);
when(iwm.inWorld(any(Location.class))).thenReturn(true);
when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock");
when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock.");
Optional<GameModeAddon> optionalAddon = Optional.of(addon);
when(iwm.getAddon(Mockito.any())).thenReturn(optionalAddon);
when(plugin.getIWM()).thenReturn(iwm);

2
src/test/java/world/bentobox/bentobox/managers/IslandWorldManagerTest.java
View File

@ -477,7 +477,7 @@ public class IslandWorldManagerTest {
@Test
public void testGetPermissionPrefix() {
when(ws.getPermissionPrefix()).thenReturn("bsky");
assertEquals("bsky", iwm.getPermissionPrefix(world));
assertEquals("bsky.", iwm.getPermissionPrefix(world));
}
/**