From d3a49bbeb0250769f69ce7c03f056596311978cc Mon Sep 17 00:00:00 2001 From: Lixfel Date: Tue, 29 Aug 2023 21:46:49 +0200 Subject: [PATCH] UserPerm --- .../bausystem/features/team/SkinCommand.java | 17 +++++++---------- .../bausystem/features/world/StopCommand.java | 5 +++-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java index ca88625f..8394691e 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java @@ -29,7 +29,7 @@ import de.steamwar.command.SWCommand; import de.steamwar.command.TypeMapper; import de.steamwar.linkage.Linked; import de.steamwar.sql.SteamwarUser; -import de.steamwar.sql.UserGroup; +import de.steamwar.sql.UserPerm; import net.md_5.bungee.api.chat.ClickEvent; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; @@ -52,10 +52,9 @@ public class SkinCommand extends SWCommand { @Register(help = true) public void genericHelp(Player p, String... args) { - SteamwarUser steamwarUser = SteamwarUser.get(p.getUniqueId()); - UserGroup userGroup = steamwarUser.getUserGroup(); + SteamwarUser user = SteamwarUser.get(p.getUniqueId()); - if (!userGroup.isAdminGroup()) { + if (!user.hasPerm(UserPerm.ADMINISTRATION)) { return; } @@ -64,10 +63,9 @@ public class SkinCommand extends SWCommand { @Register public void createCommand(Player p, @OptionalValue("") @Mapper("force") String force, @Mapper("kuerzel") String typeKuerzel, @Mapper("creator") String creator, String... names) { - SteamwarUser steamwarUser = SteamwarUser.get(p.getUniqueId()); - UserGroup userGroup = steamwarUser.getUserGroup(); + SteamwarUser user = SteamwarUser.get(p.getUniqueId()); - if (!userGroup.isAdminGroup()) { + if (!user.hasPerm(UserPerm.ADMINISTRATION)) { return; } Region region = Region.getRegion(p.getLocation()); @@ -113,10 +111,9 @@ public class SkinCommand extends SWCommand { @Register("boundary") public void showRegionBoundaries(Player p) { - SteamwarUser steamwarUser = SteamwarUser.get(p.getUniqueId()); - UserGroup userGroup = steamwarUser.getUserGroup(); + SteamwarUser user = SteamwarUser.get(p.getUniqueId()); - if (!userGroup.isAdminGroup()) { + if (!user.hasPerm(UserPerm.ADMINISTRATION)) { return; } if (BoundaryViewer.viewers.contains(p)) { diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/StopCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/StopCommand.java index e71b294e..4017e548 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/world/StopCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/StopCommand.java @@ -26,6 +26,7 @@ import de.steamwar.command.SWCommand; import de.steamwar.command.TypeValidator; import de.steamwar.linkage.Linked; import de.steamwar.sql.SteamwarUser; +import de.steamwar.sql.UserPerm; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -53,8 +54,8 @@ public class StopCommand extends SWCommand { if (Permission.hasPermission(player, Permission.WORLD)) { return true; } - SteamwarUser steamwarUser = SteamwarUser.get(player.getUniqueId()); - if (steamwarUser.getUserGroup().isAdminGroup()) { + SteamwarUser user = SteamwarUser.get(player.getUniqueId()); + if (user.hasPerm(UserPerm.ADMINISTRATION)) { return true; } messageSender.send("STOP_NO_PERMS");