From 93fa38d9daf3681fc7b3d861504bfae80d6219d4 Mon Sep 17 00:00:00 2001 From: Taah Date: Mon, 21 Feb 2022 16:29:52 -0800 Subject: [PATCH] - Make adminworld check for ranks or permissions --- .../dev/plex/listener/impl/WorldListener.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/dev/plex/listener/impl/WorldListener.java b/src/main/java/dev/plex/listener/impl/WorldListener.java index 4ace4aa..a2c7a2f 100644 --- a/src/main/java/dev/plex/listener/impl/WorldListener.java +++ b/src/main/java/dev/plex/listener/impl/WorldListener.java @@ -10,6 +10,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.entity.EntitySpawnEvent; + import static dev.plex.util.PlexUtils.tl; public class WorldListener extends PlexListener @@ -22,11 +23,19 @@ public class WorldListener extends PlexListener World world = player.getWorld(); switch (world.getName().toLowerCase()) { - case "adminworld": - { - if (plexPlayer.getRankFromString().isAtLeast(Rank.ADMIN)) + case "adminworld" -> { + if (plugin.getSystem().equalsIgnoreCase("ranks")) { - return; + if (plexPlayer.getRankFromString().isAtLeast(Rank.ADMIN)) + { + return; + } + } else if (plugin.getSystem().equalsIgnoreCase("permissions")) + { + if (player.hasPermission("plex.adminworld")) + { + return; + } } e.setCancelled(true); player.sendMessage(tl("noAdminWorldBlockPlace"));