box flag checker

src/engine/objects/Mine.java

@@ -326,8 +326,6 @@ public class Mine extends AbstractGameObject {
         // all the requirements to claim; landed
         // guild with a warehouse, etc.
 
-        Guild playerGuild;
-
         //verify the player exists
 
         if (playerCharacter == null)
@@ -335,7 +333,7 @@ public class Mine extends AbstractGameObject {
 
         //verify the player is in valid guild
 
-        playerGuild = playerCharacter.getGuild();
+        Guild playerGuild = playerCharacter.getGuild();
 
         // Can't claim something if you don't have a guild!
 
@@ -357,40 +355,9 @@ public class Mine extends AbstractGameObject {
             return false;
         }
 
-        // Number of mines is based on the rank of the nation's tree.
-
-        City nationCapitol = playerGuild.getNation().getOwnedCity();
-
-        Building nationCapitolTOL = nationCapitol.getTOL();
-
-        if (nationCapitolTOL == null)
-            return false;
-
-        //int treeRank = nationCapitolTOL.getRank();
-
-        //if (treeRank < 1)
-        //    return false;
-
-        //if (guildUnderMineLimit(playerGuild.getNation(), treeRank) == false) {
-        //    ErrorPopupMsg.sendErrorMsg(playerCharacter, "Your nation cannot support another mine.");
-        //    return false;
-        //}
-
         return true;
     }
 
-    private static boolean guildUnderMineLimit(Guild playerGuild, int tolRank) {
-
-        int mineCnt = 0;
-
-        mineCnt += Mine.getMinesForGuild(playerGuild.getObjectUUID()).size();
-
-        for (Guild guild : playerGuild.getSubGuildList())
-            mineCnt += Mine.getMinesForGuild(guild.getObjectUUID()).size();
-
-        return mineCnt <= tolRank;
-    }
-
     public boolean changeProductionType(Resource resource) {
         //if (!this.validForMine(resource))
         //    return false;

src/engine/workthreads/BoxFlagThread.java

@@ -40,15 +40,15 @@ public class BoxFlagThread implements Runnable {
             if(LocalDateTime.now().isAfter(nextPulse)) {
                 for(PlayerCharacter pc : SessionManager.getAllActivePlayerCharacters()){
                     if(pc.isEnteredWorld() && pc.isActive()){
-
+                        pc.isBoxed = PlayerCharacter.checkIfBoxed(pc);
-                        if(PlayerCharacter.checkIfBoxed(pc)) {
+                        if(pc.isBoxed) {
                             if(pc.title.equals(CharacterTitle.BOX) == false) {
                                 pc.title = CharacterTitle.BOX;
                                 //InterestManager.reloadCharacter(pc);
                                 InterestManager.setObjectDirty(pc);
-                            }
+                                if (pc.containsEffect(1672601862) == false) {//Deathshroud
-                            if (pc.containsEffect(1672601862) == false) {//Deathshroud
+                                    PowersManager.applyPower(pc, pc, Vector3fImmutable.ZERO, 1672601862, 40, false);
-                                PowersManager.applyPower(pc, pc, Vector3fImmutable.ZERO, 1672601862, 40, false);
+                                }
                             }
                         }else{
                             if(pc.title.equals(CharacterTitle.NONE) == false) {