Fixed Wilderness Permissions

Iridium-Development · Feb 10, 2024 · 518f402 · 518f402
1 parent 5fff0f7
commit 518f402
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 34 deletions.
diff --git a/src/main/java/com/iridium/iridiumfactions/IridiumFactions.java b/src/main/java/com/iridium/iridiumfactions/IridiumFactions.java
@@ -4,7 +4,6 @@
 import com.iridium.iridiumfactions.database.Faction;
 import com.iridium.iridiumfactions.database.User;
 import com.iridium.iridiumfactions.listeners.EntityDamageListener;
-import com.iridium.iridiumfactions.listeners.PlayerInteractListener;
 import com.iridium.iridiumfactions.listeners.PlayerPortalListener;
 import com.iridium.iridiumfactions.managers.CommandManager;
 import com.iridium.iridiumfactions.managers.DatabaseManager;
@@ -112,7 +111,6 @@ private Economy setupEconomy() {
     public void registerListeners() {
         super.registerListeners();
         Bukkit.getPluginManager().registerEvents(new PlayerPortalListener(), this);
-        Bukkit.getPluginManager().registerEvents(new PlayerInteractListener(), this);
         Bukkit.getPluginManager().registerEvents(new EntityDamageListener(), this);
     }
 

diff --git a/src/main/java/com/iridium/iridiumfactions/listeners/PlayerInteractListener.java b/src/main/java/com/iridium/iridiumfactions/listeners/PlayerInteractListener.java
diff --git a/src/main/java/com/iridium/iridiumfactions/managers/FactionManager.java b/src/main/java/com/iridium/iridiumfactions/managers/FactionManager.java
@@ -175,6 +175,7 @@ public boolean deleteTeam(Faction faction, User user) {
 
     @Override
     public synchronized boolean getTeamPermission(Faction faction, int rank, String permission) {
+        if(faction.getFactionType() == FactionType.WILDERNESS) return true;
         if (rank == Rank.OWNER.getId()) return true;
         return IridiumFactions.getInstance().getDatabaseManager().getPermissionsTableManager().getEntry(new TeamPermission(faction, permission, rank, true))
                 .map(TeamPermission::isAllowed)