properly check permissions in guis

Author: BlueZeeKing

gradle.properties

@@ -6,7 +6,7 @@ yarn_mappings=1.21.4+build.1
 loader_version=0.16.9
 
 # Mod Properties
-mod_version = 2.7.0
+mod_version = 2.7.1
 maven_group = io.icker
 archives_base_name = factions
 

src/main/java/io/icker/factions/command/ClaimCommand.java

@@ -89,14 +89,12 @@ private int addForced(CommandContext<ServerCommandSource> context, int size)
                 if (existingClaim != null) {
                     if (size == 1) {
                         String owner =
-                                existingClaim.getFaction().getID() == faction.getID()
-                                        ? "Your"
-                                        : "Another";
+                                existingClaim.getFaction().equals(faction) ? "Your" : "Another";
                         new Message(owner + " faction already owns this chunk")
                                 .fail()
                                 .send(player, false);
                         return 0;
-                    } else if (existingClaim.getFaction().getID() != faction.getID()) {
+                    } else if (!existingClaim.getFaction().equals(faction)) {
                         new Message("Another faction already owns a chunk")
                                 .fail()
                                 .send(player, false);
@@ -220,7 +218,7 @@ private int removeSize(CommandContext<ServerCommandSource> context)
                 Claim existingClaim = Claim.get(chunkPos.x, chunkPos.z, dimension);
 
                 if (existingClaim != null
-                        && (user.bypass || existingClaim.getFaction().getID() == faction.getID()))
+                        && (user.bypass || existingClaim.getFaction().equals(faction)))
                     existingClaim.remove();
             }
         }

src/main/java/io/icker/factions/core/InteractionManager.java

@@ -190,7 +190,7 @@ private static ActionResult isInvulnerableTo(Entity source, Entity target) {
         Faction sourceFaction = sourceUser.getFaction();
         Faction targetFaction = targetUser.getFaction();
 
-        if (sourceFaction.getID() == targetFaction.getID()) {
+        if (sourceFaction.equals(targetFaction)) {
             return ActionResult.SUCCESS;
         }
 
@@ -233,7 +233,7 @@ private static ActionResult checkPermissions(
 
         Faction userFaction = user.getFaction();
 
-        if (claimFaction == userFaction
+        if (claimFaction.equals(userFaction)
                 && (getRankLevel(claim.accessLevel) <= getRankLevel(user.rank)
                         || (user.rank == User.Rank.GUEST
                                 && claimFaction.guest_permissions.contains(permission)

src/main/java/io/icker/factions/ui/InfoGui.java

@@ -38,7 +38,7 @@ public InfoGui(ServerPlayerEntity player, Faction faction, @Nullable Runnable cl
         UserCache cache = server.getUserCache();
 
         User user = User.get(player.getUuid());
-        boolean isMember = faction == user.getFaction();
+        boolean isMember = faction.equals(user.getFaction());
         List<User> members = faction.getUsers();
 
         String owner =
@@ -243,7 +243,7 @@ public InfoGui(ServerPlayerEntity player, Faction faction, @Nullable Runnable cl
                                                         .formatted(Formatting.GREEN)))
                         .setLore(enemies));
 
-        if (Command.Requires.isOwner().test(player.getCommandSource())) {
+        if (Command.Requires.isOwner().test(player.getCommandSource()) && isMember) {
             this.setSlot(
                     6,
                     new GuiElementBuilder(Items.PLAYER_HEAD)

src/main/java/io/icker/factions/ui/ListGui.java

@@ -53,7 +53,7 @@ protected DisplayElement getElement(int id) {
         if (this.size > id) {
             var faction = this.factions.get(id);
 
-            boolean isInFaction = this.user.getFaction() == faction;
+            boolean isInFaction = this.user.getFaction().equals(faction);
             Home home = faction.getHome();
 
             var icon = new GuiElementBuilder(Items.PLAYER_HEAD);

src/main/java/io/icker/factions/ui/MemberGui.java

@@ -77,7 +77,7 @@ protected DisplayElement getElement(int id) {
             icon.setComponent(DataComponentTypes.PROFILE, new ProfileComponent(profile));
             icon.setName(Text.literal(profile.getName()));
 
-            if (profile == unknownPlayer) {
+            if (profile.equals(unknownPlayer)) {
                 List<Text> lore =
                         List.of(
                                 Text.literal("No info available")
@@ -108,7 +108,8 @@ protected DisplayElement getElement(int id) {
             if (!profile.getId().equals(player.getUuid())
                     && Command.Requires.isLeader().test(player.getCommandSource())
                     && Command.Requires.hasPerms("factions.rank.promote", 0)
-                            .test(player.getCommandSource())) {
+                            .test(player.getCommandSource())
+                    && user.getFaction().equals(faction)) {
                 lore.add(
                         Text.literal("Click to promote.")
                                 .setStyle(

src/main/java/io/icker/factions/util/BlueMapWrapper.java

@@ -164,7 +164,7 @@ private void setHome(Faction faction, Home home) {
         }
 
         for (Map.Entry<String, MarkerSet> entry : markerSets.entrySet()) {
-            if (entry.getKey() == home.level) {
+            if (entry.getKey().equals(home.level)) {
                 continue;
             }
 

src/main/java/io/icker/factions/util/SquareMapWrapper.java

@@ -158,7 +158,7 @@ private void setHome(Faction faction, Home home) {
         }
 
         for (Map.Entry<String, SimpleLayerProvider> entry : layers.entrySet()) {
-            if (entry.getKey() == home.level) {
+            if (entry.getKey().equals(home.level)) {
                 continue;
             }