Bronzewood mine_production updated.

src/engine/mbEnums.java

@@ -2721,7 +2721,7 @@ public class mbEnums {
         ANTIMONY(1580014, 1256147265, 452320058, 1000, 10),
         AZOTH(1580012, -1205326951, 78329697, 2000, 20),
         BLOODSTONE(1580020, -1912381716, -1569826353, 500, 5),
-        BRONZEWOOD(1580006, -519681813, 1334770447, 500, 10),
+        BRONZEWOOD(1580006, -519681813, 1334770447, 1000, 30),
         COAL(1580008, -1672872311, 2559427, 3000, 30),
         DIAMOND(1580010, 1540225085, -1730704107, 2000, 20),
         GALVOR(1580017, -1683992404, -1596311545, 2000, 5),

src/engine/objects/City.java

@@ -306,65 +306,63 @@ public class City extends AbstractWorldObject {
             if (city.parentZone == null)
                 continue;
 
-            if(repledge && city.getGuild().equals(playerCharacter.guild)){
+            //can't repledge to a guild you're already part of
-                //can't repledge to a guild you're already part of
+
+            if (repledge && city.getGuild().equals(playerCharacter.guild))
                 continue;
-            }
 
             if (city.parentZone.guild_zone) {
 
+                //players can all port and repledge inside their own nation
+
                 if(city.getGuild().getNation().equals(playerCharacter.guild.getNation())){
-                    //players can all port and repledge inside their own nation
                     cities.add(city);
                     continue;
                 }
+
                 if (city.isOpen() && city.getTOL().rank > 4) {
 
                     // Filter Lore cities
 
                     if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
 
-                        if (!repledge)
+                        if (repledge) {
-                            if (!city.getGuild().charter.equals(playerCharacter.guild.charter))
+                            if (!city.getGuild().charter.canJoin(playerCharacter))
                                 continue;
-                            else if (!city.getGuild().charter.canJoin(playerCharacter))
+                        } else if (!city.getGuild().charter.equals(playerCharacter.guild.charter))
                                 continue;
                     }
+
                     Integer playerUUID = playerCharacter.objectUUID;
                     Integer guildUUID = playerCharacter.guildUUID;
                     Integer nationUUID = playerCharacter.guild.getNation().getObjectUUID();
                     boolean allowed = false;
+
                     if (city.getTOL().reverseKOS) {
+
                         //reverse KOS, specific values are allowed
-                        if (city.getTOL().getCondemned().contains(playerUUID) && city.getTOL().getCondemned().get(playerUUID).active) {
+
-                            //individual is cleared for teleport/repledge
+                        if ((city.getTOL().getCondemned().containsKey(playerUUID) && city.getTOL().getCondemned().get(playerUUID).active) ||
+                                (city.getTOL().getCondemned().containsKey(guildUUID) && city.getTOL().getCondemned().get(guildUUID).active) ||
+                                (city.getTOL().getCondemned().containsKey(nationUUID) && city.getTOL().getCondemned().get(nationUUID).active))
                             allowed = true;
-                        } else if (city.getTOL().getCondemned().contains(guildUUID) && city.getTOL().getCondemned().get(guildUUID).active) {
+
-                            //player guild is cleared for teleport/repledge
-                            allowed = true;
-                        } else if (city.getTOL().getCondemned().contains(nationUUID) && city.getTOL().getCondemned().get(nationUUID).active) {
-                            //player nation is cleared for teleport/repledge
-                            allowed = true;
-                        }
                     } else {
                         //not reverse KOS, everyone is allowed by default
+
                         allowed = true;
+
                         //specific values are not allowed
-                        if (city.getTOL().getCondemned().contains(playerUUID) && city.getTOL().getCondemned().get(playerUUID).active) {
+
-                            //individual is cleared for teleport/repledge
+                        if ((city.getTOL().getCondemned().containsKey(playerUUID) && city.getTOL().getCondemned().get(playerUUID).active) ||
+                                (city.getTOL().getCondemned().containsKey(guildUUID) && city.getTOL().getCondemned().get(guildUUID).active) ||
+                                (city.getTOL().getCondemned().containsKey(nationUUID) && city.getTOL().getCondemned().get(nationUUID).active))
                             allowed = false;
-                        } else if (city.getTOL().getCondemned().contains(guildUUID) && city.getTOL().getCondemned().get(guildUUID).active) {
+
-                            //player guild is cleared for teleport/repledge
-                            allowed = false;
-                        } else if (city.getTOL().getCondemned().contains(nationUUID) && city.getTOL().getCondemned().get(nationUUID).active) {
-                            //player nation is cleared for teleport/repledge
-                            allowed = false;
-                        }
                     }
-                    if (allowed) {
+
+                    if (allowed)
                         cities.add(city);
-                        continue;
-                    }
                 }
             } else {