bug fixes

- Fix: Admin power applied to current power value
- Fix: Admin protection prevent actions on claims if required power is higher than current power value

Author: Arona74

src/main/java/io/icker/factions/api/persistents/Faction.java

@@ -163,8 +163,8 @@ public String getMOTD() {
 
     public int getPower() {
         int basePowerMax = getBasePowerMax();
-        int basePower = Math.min(power + adminPower, basePowerMax);
-        return basePower + getWealthPower() + getWarPower() + getFamePower() + getVassalPowerBonus();
+        int basePower = Math.min(power, basePowerMax);
+        return basePower + adminPower + getWealthPower() + getWarPower() + getFamePower() + getVassalPowerBonus();
     }
 
     public int getBasePowerMax() {
@@ -677,7 +677,7 @@ public int calculateMaxPower() {
     }
 
     public Collection<User> getRelationships() {
-        // TODO Auto-generated method stub
+        // TO DO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'getRelationships'");
     }
 

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

@@ -288,7 +288,7 @@ private static ActionResult checkPermissions(PlayerEntity player, BlockPos posit
 
         Faction claimFaction = claim.getFaction();
 
-        if (claimFaction.getClaims().size() * FactionsMod.CONFIG.POWER.CLAIM_WEIGHT > claimFaction
+        if (!claimFaction.isAdminProtected() && claimFaction.getClaims().size() * FactionsMod.CONFIG.POWER.CLAIM_WEIGHT > claimFaction
                 .getPower()) {
             return ActionResult.PASS;
         }