parsing multi worded names

src/engine/ConfigParsing/EffectsData/Condition.java

@@ -0,0 +1,6 @@
+package engine.ConfigParsing.EffectsData;
+
+public class Condition {
+    public String type;
+    public String value;
+}

src/engine/ConfigParsing/EffectsData/EffectData.java

@@ -0,0 +1,14 @@
+package engine.ConfigParsing.EffectsData;
+
+import engine.mbEnums;
+
+import java.util.ArrayList;
+
+public class EffectData {
+    public String id;
+    public String name;
+    public int icon;
+    public ArrayList<mbEnums.EffectSourceType> sources;
+    public ArrayList<Mod> mods;
+    public ArrayList<String> conditions;
+}

src/engine/ConfigParsing/EffectsData/Mod.java

@@ -0,0 +1,10 @@
+package engine.ConfigParsing.EffectsData;
+
+import engine.mbEnums;
+
+import java.util.ArrayList;
+
+public class Mod {
+    public mbEnums.ModType type;
+    public ArrayList<String> values;
+}

src/engine/ConfigParsing/EffectsParser.java

@@ -0,0 +1,200 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2024
+//                www.magicbane.com
+
+
+package engine.ConfigParsing;
+
+import engine.ConfigParsing.EffectsData.Condition;
+import engine.ConfigParsing.EffectsData.EffectData;
+import engine.ConfigParsing.EffectsData.Mod;
+import engine.gameManager.ConfigManager;
+import engine.mbEnums;
+import org.pmw.tinylog.Logger;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class EffectsParser {
+
+    public static String EffectsPath = ConfigManager.DEFAULT_DATA_DIR + "wpak/Effects.cfg";
+    public static HashMap<String, EffectData> effect_data = new HashMap<>();
+
+    public static void init() throws IOException {
+
+        ArrayList<ArrayList<String>> compiledData = new ArrayList<>();
+        List<String> fileData = Files.readAllLines(Paths.get(EffectsPath));
+        ArrayList<String> modData = new ArrayList<>();
+
+        for (String line : fileData) {
+
+            if (line.contains("EFFECTBEGIN")) {
+                modData = new ArrayList<>();
+                continue;
+            }
+
+            if (line.contains("EFFECTEND"))
+                compiledData.add(modData);
+            else
+                modData.add(line);
+        }
+
+        CreateBlocks(compiledData);
+    }
+
+    public static void CreateBlocks(ArrayList<ArrayList<String>> compiledData) {
+
+        for (ArrayList<String> compiledLines : compiledData) {
+
+            EffectData effectData = new EffectData();
+            effectData.id = compiledLines.get(1).replace("     ", "").split(" ")[0];
+            effectData.sources = new ArrayList<>();
+            effectData.mods = new ArrayList<>();
+            effectData.conditions = new ArrayList<>();
+
+            try {
+                String rawData = compiledLines.get(1).replace("     ", "");
+                if(rawData.contains("\"")){
+                    int startIndex = rawData.indexOf('"') + 1;
+                    int endIndex = rawData.lastIndexOf('"');
+                    char[] nameValue = rawData.toCharArray();
+                    String name = "";
+                    for(int i = startIndex; i < endIndex; i++){
+                        name += nameValue[i];
+                    }
+                    effectData.name = name;
+                }
+                int iconID;
+                try {
+                    iconID = Integer.parseInt(compiledLines.get(1).replace("     ", "").split(" ")[2]);
+                } catch(Exception e){
+                    iconID = 0;
+                }
+                effectData.icon = iconID;
+            } catch (Exception e) {
+                Logger.error(e);
+            }
+
+            int index = 0;
+
+            //log all sources
+
+            for (String line : compiledLines) {
+                String rawValue;
+                if (line.contains("SOURCEBEGIN")) {
+                    rawValue = compiledLines.get(index + 1).replace("          ", "");
+                    switch (rawValue) {
+                        case "Crush":
+                            rawValue = "Crushing";
+                            break;
+                        case "Slash":
+                            rawValue = "Slashing";
+                            break;
+                        case "Pierce":
+                            rawValue = "Piercing";
+                            break;
+
+                    }
+                    effectData.sources.add(mbEnums.EffectSourceType.valueOf(rawValue));
+                }
+                index++;
+            }
+
+            //log all mods
+
+            index = 0;
+
+            for (String line : compiledLines) {
+
+                if (line.contains("MODSBEGIN")) {
+
+                    int extra = 1;
+                    Mod mod = new Mod();
+
+                    while (!compiledLines.get(index + extra).contains("MODSEND")) {
+                        //data.mods.add(lines[index + extra].Replace("          ", ""));
+                        String rawValue = compiledLines.get(index + extra).replace("          ", "").split(" ")[0];
+                        try {
+                            mod.type = mbEnums.ModType.valueOf(rawValue);
+                        }catch(Exception e){
+                            mod.type = mbEnums.ModType.None;
+                        }
+                        GenerateModValues(mod, compiledLines.get(index + extra).replace("          ", "").replace("    ", "").split(" "));
+                        extra++;
+                    }
+                    effectData.mods.add(mod);
+                }
+                index++;
+            }
+
+            //log all conditions
+
+            index = 0;
+            for (String line : compiledLines) {
+
+                if (line.contains("CONDITIONBEGIN")) {
+
+                    int extra = 1;
+
+                    while (!compiledLines.get(index + extra).contains("CONDITIONEND")) {
+
+                        if (!compiledLines.get(index + extra).contains("#")) {
+                            //data.conditions.add(lines[index + extra].Replace("          ", ""));
+                            Condition condition = new Condition();
+                            condition.type = compiledLines.get(index + extra).replace("          ", "").split(" ")[0];
+                            condition.value = compiledLines.get(index + extra).replace("          ", "").split(" ")[1];
+                        }
+                        extra++;
+                    }
+                }
+                index++;
+            }
+            effect_data.put(effectData.id, effectData);
+        }
+        Logger.info("Effects.cfg Parsing Completed");
+    }
+
+    public static void GenerateModValues(Mod inMod, String[] data) {
+
+
+
+        int maxValue = 5;
+
+        if(inMod.type != null && inMod.type.name().equals("Health")){
+            maxValue = 7;
+        }
+
+        if(data.length < maxValue)
+            maxValue = data.length;
+
+        inMod.values = new ArrayList<>();
+
+        for (int i = 1; i < data.length; i++)
+            if (!data[i].isEmpty()) {
+                if (i >= maxValue)
+                    continue;
+
+                if (i == maxValue - 1)
+                    try {
+                        String entry = "";
+                        for (int j = i; j < data.length; j ++){
+                           entry += data[j] + " ";
+                        }
+                        entry = entry.trim();
+                        inMod.values.add(entry.trim());
+                    } catch (Exception e) {
+                        inMod.values.add(data[i]);
+                    }
+                else
+                    inMod.values.add(data[i]);
+            }
+    }
+}

src/engine/gameManager/BuildingManager.java

@@ -104,67 +104,67 @@ public enum BuildingManager {
         if (building == null)
             return false;
 
+        //cannot access destroyed buildings
         if (building.getRank() == -1)
             return false;
 
-        if (IsOwner(building, player))
-            return true;
-
-        //individual friend.
-
-        if (building.getFriends() != null && building.getFriends().get(player.getObjectUUID()) != null)
-            return true;
-
-        //Admins can access stuff
-
+        //admin characters can always access buildings
         if (player.isCSR())
             return true;
 
-        //Guild stuff
-
-        if (building.getGuild().isGuildLeader(player.getObjectUUID()))
-            return true;
-
-        if (building.getFriends().get(player.getGuild().getObjectUUID()) != null && building.getFriends().get(player.getGuild().getObjectUUID()).friendType == 8)
-            return true;
-
-        if (building.getFriends().get(player.getGuild().getObjectUUID()) != null && building.getFriends().get(player.getGuild().getObjectUUID()).friendType == 9 && GuildStatusController.isInnerCouncil(player.getGuildStatus()))
-            return true;
-
-        if (Guild.sameGuild(building.getGuild(), player.getGuild()) && GuildStatusController.isInnerCouncil(player.getGuildStatus()))
-            return true;
-
-        return Guild.sameGuild(building.getGuild(), player.getGuild()) && GuildStatusController.isGuildLeader(player.getGuildStatus());
-
-        //TODO test friends list once added
-        //does not meet above criteria. Cannot access.
-    }
-
-    public static boolean playerCanManageNotFriends(PlayerCharacter player, Building building) {
-
-        //Player Can only Control Building if player is in Same Guild as Building and is higher rank than IC.
-
-        if (player == null)
-            return false;
-
-        if (building == null)
-            return false;
-
-        if (building.getRank() == -1)
-            return false;
-
+        //owner can always access their own building
         if (IsOwner(building, player))
             return true;
 
-        //Somehow guild leader check fails? lets check if Player is true Guild GL.
-        if (building.getGuild() != null && building.getGuild().isGuildLeader(player.getObjectUUID()))
-            return true;
+        //check for default IC access if building belongs to same guild
+        if(player.guild.equals(building.getGuild())) {
+            if (building.getBlueprint() != null && building.getBlueprint().getBuildingGroup() != null) {
+                switch (building.getBlueprint().getBuildingGroup()) {
+                    case TOL:
+                    case BARRACK:
+                    case SPIRE:
+                    case SHRINE:
+                    case BANESTONE:
+                    case MINE:
+                    case WAREHOUSE:
+                    case BULWARK:
+                    case SIEGETENT:
+                        if (GuildStatusController.isInnerCouncil(player.getGuildStatus()))
+                            return true;
+                        if (GuildStatusController.isGuildLeader(player.getGuildStatus()))
+                            return true;
+                        break;
+                }
+            }
+        }
 
-        if (!GuildStatusController.isGuildLeader(player.getGuildStatus()) && !GuildStatusController.isInnerCouncil(player.getGuildStatus()))
-            return false;
+        //check against friends list entries if any present
+        if (building.getFriends() != null) {
 
+            //check individuals
+            if (building.getFriends().get(player.getObjectUUID()) != null)
+                return true;
+
+            if (building.getFriends().get(player.guild.objectUUID) != null) {
+
+                //check friend type for guild related access
+                switch (building.getFriends().get(player.guild.objectUUID).friendType) {
+                    case 8: //full member
+                        if (GuildStatusController.isFullMember(player.getGuildStatus()))
+                            return true;
+                        break;
+                    case 9: //Inner Council
+                        if (GuildStatusController.isInnerCouncil(player.getGuildStatus()))
+                            return true;
+                        if (GuildStatusController.isGuildLeader(player.getGuildStatus()))
+                            return true;
+                        break;
+
+                }
+            }
+        }
+        //did not meet access grant criteria, deny access
         return false;
-
     }
 
     public static synchronized boolean lootBuilding(PlayerCharacter player, Building building) {
@@ -468,6 +468,14 @@ public enum BuildingManager {
         if (Guild.sameNationExcludeErrant(building.getGuild(), player.getGuild()))
             return false;
 
+        if(building.enforceKOS) {
+            if (building.getCity() != null) {
+                Building TOL = building.getCity().getTOL();
+                if (TOL != null) {
+                    building = TOL;
+                }
+            }
+        }
         if (!building.reverseKOS) {
 
             Condemned condemn = building.getCondemned().get(player.getObjectUUID());

src/engine/gameManager/CombatManager.java

@@ -197,8 +197,6 @@ public enum CombatManager {
                 }
         }
 
-        checkForProc(attacker,target,weapon);
-
         //get delay for the auto attack job
         long delay = 5000;
 
@@ -223,6 +221,16 @@ public enum CombatManager {
 
         if (inRange) {
 
+            if(attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)){
+                if(!attacker.getTimestamps().contains(slot.name()+"Attack")){
+                    attacker.getTimestamps().put(slot.name()+"Attack", System.currentTimeMillis() - 1000);
+                } else if(System.currentTimeMillis() < attacker.getTimestamps().get(slot.name()+"Attack") + delay){
+                    setAutoAttackJob(attacker,slot,delay);
+                    return;
+                }
+            }
+
+
             //handle retaliate
             if (AbstractCharacter.IsAbstractCharacter(target)) {
                 if (((AbstractCharacter) target).combatTarget == null || !((AbstractCharacter) target).combatTarget.isAlive()) {
@@ -359,6 +367,9 @@ public enum CombatManager {
                 }
             }
 
+            //check for proccing
+            checkForProc(attacker,target,weapon);
+
             //calculate the base damage
             int damage = ThreadLocalRandom.current().nextInt(min, max + 1);
             if (damage == 0) {

src/engine/gameManager/ForgeManager.java

@@ -265,12 +265,12 @@ public enum ForgeManager implements Runnable {
 
         // Assign a prefix and suffix to this item if random rolled
 
-        if (workOrder.prefixToken == 0)
+        if (workOrder.prefixToken == 0 && workOrder.vendor.getItemModTable().contains((template.modTable)))
             forgedItem.prefixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.PREFIX, template.modTable);
         else
             forgedItem.prefixToken = workOrder.prefixToken;
 
-        if (workOrder.suffixToken == 0)
+        if (workOrder.suffixToken == 0 && workOrder.vendor.getItemModTable().contains((template.modTable)))
             forgedItem.suffixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.SUFFIX, template.modTable);
         else
             forgedItem.suffixToken = workOrder.suffixToken;

src/engine/gameManager/ItemManager.java

@@ -102,7 +102,7 @@ public enum ItemManager {
             if (characterSkill == null)
                 return false;
 
-            if (characterSkill.getModifiedAmountBeforeMods() > required_value)
+            if (characterSkill.getModifiedAmountBeforeMods() >= required_value)
                 return true;
 
         }

src/engine/gameManager/PowersManager.java

@@ -926,21 +926,6 @@ public enum PowersManager {
                     mobTarget.handleDirectAggro(playerCharacter);
             }
 
-            //Check for immunities
-            if (target.getObjectType() == GameObjectType.PlayerCharacter) {
-                PlayerCharacter pcTarget = (PlayerCharacter) target;
-                PlayerBonuses tarBonus = pcTarget.getBonuses();
-                SourceType source = SourceType.GetSourceType(pb.category);
-                boolean immune = tarBonus.getBool(ModType.ImmuneTo, source);
-                if(!immune){
-                    DamageType damageType = DamageType.getDamageType(pb.category);
-                    immune = pcTarget.getResists().immuneTo(damageType);
-                }
-                if(immune){
-                    return;
-                }
-            }
-
             // update target of used power timer
 
             if (pb.isHarmful())
@@ -961,8 +946,7 @@ public enum PowersManager {
                     continue;
                 // If something blocks the action, then stop
 
-                if (ab.blocked(target, pb, trains)) {
-
+                if (ab.blocked(target,pb.vampDrain)) {
                     PowersManager.sendEffectMsg(playerCharacter, 5, ab, pb);
                     continue;
                 }
@@ -1137,7 +1121,7 @@ public enum PowersManager {
                     continue;
                 // If something blocks the action, then stop
 
-                if (ab.blocked(target, pb, trains))
+                if (ab.blocked(target,pb.vampDrain))
                     continue;
                 // TODO handle overwrite stack order here
                 String stackType = ab.getStackType();
@@ -1451,7 +1435,7 @@ public enum PowersManager {
             if (trains < ab.getMinTrains() || trains > ab.getMaxTrains())
                 continue;
             // If something blocks the action, then stop
-            if (ab.blocked(target, pb, trains))
+            if (ab.blocked(target,pb.vampDrain))
                 // sendPowerMsg(pc, 5, msg);
                 continue;
             // TODO handle overwrite stack order here

src/engine/loot/WorkOrder.java

@@ -135,7 +135,8 @@ public class WorkOrder implements Delayed {
         if (!workOrder.vendor.charItemManager.hasRoomInventory(template.item_wt))
             return 30;  //30: That person cannot carry that item
 
-        if (!workOrder.vendor.getItemModTable().contains((template.modTable)))
+        if ((workOrder.prefixToken != 0 || workOrder.suffixToken != 0) &&
+                !workOrder.vendor.getItemModTable().contains((template.modTable)))
             return 59;   //59: This hireling does not have this formula
 
         if (!Warehouse.calcCostOverrun(workOrder).isEmpty())

src/engine/mbEnums.java

@@ -831,16 +831,22 @@ public class mbEnums {
         SPIRES,
         SNARE,
         STUN,
-        BLIND,
+        BLINDNESS,
         ROOT,
         FEAR,
         CHARM,
-        POWERBLOCK,
+        POWERINHIBITOR,
         DEBUFF,
         STEAL,
         DRAIN;
 
         public static DamageType getDamageType(String modName) {
+            if(modName.toLowerCase().equals("blind"))
+                modName = "BLINDNESS";
+
+            if(modName.toLowerCase().equals("powerblock"))
+                modName = "POWERINHIBITOR";
+
             DamageType damageType;
             if (modName.isEmpty())
                 return DamageType.NONE;
@@ -2741,6 +2747,7 @@ public class mbEnums {
 
         public static HashMap<Integer, ResourceType> templateLookup = new HashMap<>();
         public static HashMap<Integer, ResourceType> templateHashLookup = new HashMap<>();
+        public static HashMap<Integer, ResourceType> resourceHashLookup = new HashMap<>();
         public int templateID;
         public ItemTemplate template;
         public int resourceHash;
@@ -2762,6 +2769,7 @@ public class mbEnums {
             for (ResourceType resourceType : ResourceType.values()) {
                 templateLookup.put(resourceType.templateID, resourceType);
                 templateHashLookup.put(resourceType.templateHash, resourceType);
+                resourceHashLookup.put(resourceType.resourceHash, resourceType);
             }
 
         }

src/engine/net/client/handlers/ArcMineChangeProductionMsgHandler.java

@@ -50,7 +50,7 @@ public class ArcMineChangeProductionMsgHandler extends AbstractClientMsgHandler
 
         //make sure valid resource
 
-        mbEnums.ResourceType resource = mbEnums.ResourceType.templateHashLookup.get(changeProductionMsg.getResourceHash());
+        mbEnums.ResourceType resource = mbEnums.ResourceType.resourceHashLookup.get(changeProductionMsg.getResourceHash());
 
         if (resource == null)
             return true;

src/engine/net/client/handlers/ClaimGuildTreeMsgHandler.java

@@ -102,7 +102,7 @@ public class ClaimGuildTreeMsgHandler extends AbstractClientMsgHandler {
                     if (building.getGuild().isEmptyGuild())
                         return true;
 
-                    if (!ManageCityAssetMsgHandler.playerCanManageNotFriends(sourcePlayer, building))
+                    if (!BuildingManager.playerCanManage(sourcePlayer, building))
                         return true;
 
 
@@ -159,7 +159,7 @@ public class ClaimGuildTreeMsgHandler extends AbstractClientMsgHandler {
                             (building == null) || playerZone == null || playerCity == null)
                         return true;
 
-                    if (!ManageCityAssetMsgHandler.playerCanManageNotFriends(sourcePlayer, building))
+                    if (!BuildingManager.playerCanManage(sourcePlayer, building))
                         return true;
 
                     boolean open = (msg.getMessageType() == OPEN_CITY);

src/engine/net/client/handlers/InviteToSubHandler.java

@@ -102,6 +102,9 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
         //source guild is limited to 7 subs
         //TODO this should be based on TOL rank
 
+        //cannot be subbed into a nation if you already have your own sub guilds
+        if(targetGuild.getSubGuildList() != null && targetGuild.getSubGuildList().size() > 0)
+            return true;
 
         if (!sourceGuild.canSubAGuild(targetGuild)) {
             sendChat(source, "This Guild can't be subbed.");

src/engine/net/client/handlers/ManageCityAssetMsgHandler.java

@@ -28,30 +28,6 @@ public class ManageCityAssetMsgHandler extends AbstractClientMsgHandler {
         super();
     }
 
-    public static boolean playerCanManageNotFriends(PlayerCharacter player, Building building) {
-
-        //Player Can only Control Building if player is in Same Guild as Building and is higher rank than IC.
-
-        if (player == null)
-            return false;
-
-        if (building.getRank() == -1)
-            return false;
-
-        if (BuildingManager.IsOwner(building, player))
-            return true;
-
-        if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false && GuildStatusController.isInnerCouncil(player.getGuildStatus()) == false)
-            return false;
-
-        //Somehow guild leader check fails above? lets check if Player is true Guild GL.
-        if (building.getGuild() != null && building.getGuild().isGuildLeader(player.getObjectUUID()))
-            return true;
-
-        return Guild.sameGuild(building.getGuild(), player.getGuild());
-
-    }
-
     @Override
     protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
 

src/engine/net/client/handlers/OrderNPCMsgHandler.java

@@ -183,7 +183,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         if (building == null)
             return;
 
-        if (ManageCityAssetMsgHandler.playerCanManageNotFriends(player, building) == false)
+        if (BuildingManager.playerCanManage(player, building) == false)
             return;
 
         if (orderNpcMsg.getPatrolSize() >= 20)
@@ -411,7 +411,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
                 case 2:
                     player = SessionManager.getPlayerCharacter(origin);
 
-                    if (ManageCityAssetMsgHandler.playerCanManageNotFriends(player, building) == false)
+                    if (BuildingManager.playerCanManage(player, building) == false)
                         return true;
 
                     if (building.getHirelings().containsKey(npc) == false)

src/engine/net/client/handlers/PetAttackMsgHandler.java

@@ -54,7 +54,7 @@ public class PetAttackMsgHandler extends AbstractClientMsgHandler {
             pet.setCombatTarget(PlayerCharacter.getPlayerCharacter(msg.getTargetID()));
 
         switch (msg.getTargetType()) {
-            case 53: //player character
+            case 52: //player character
                 pet.setCombatTarget(PlayerCharacter.getPlayerCharacter(msg.getTargetID()));
                 break;
             case 37://mob

src/engine/net/client/handlers/TransferGoldToFromBuildingMsgHandler.java

@@ -53,7 +53,7 @@ public class TransferGoldToFromBuildingMsgHandler extends AbstractClientMsgHandl
 
         if (msg.getDirection() == 2) {
 
-            if (!ManageCityAssetMsgHandler.playerCanManageNotFriends(player, building))
+            if (!BuildingManager.playerCanManage(player, building))
                 return true;
             if (building.setReserve(msg.getUnknown01(), player)) {
                 dispatch = Dispatch.borrow(player, msg);

src/engine/objects/Building.java

@@ -163,6 +163,11 @@ public class Building extends AbstractWorldObject {
             if (upgradeTimeStamp != null)
                 this.upgradeDateTime = LocalDateTime.ofInstant(upgradeTimeStamp.toInstant(), ZoneId.systemDefault());
 
+            if(rs.getInt("enforceKOS") == 0)
+                this.enforceKOS = false;
+            else
+                this.enforceKOS = true;
+
         } catch (Exception e) {
             Logger.error("Failed for object " + this.blueprintUUID + ' ' + this.getObjectUUID() + e);
         }
@@ -1447,7 +1452,7 @@ public class Building extends AbstractWorldObject {
 
     public synchronized boolean setReserve(int amount, PlayerCharacter player) {
 
-        if (!BuildingManager.playerCanManageNotFriends(player, this))
+        if (!BuildingManager.playerCanManage(player, this))
             return false;
 
         if (amount < 0)

src/engine/objects/CharacterItemManager.java

@@ -1400,6 +1400,7 @@ public class CharacterItemManager {
 
             if (!ItemManager.validForSkills(item, pc.getSkills())) {
                 this.forceToInventory(slot, item, pc, initialized);
+                this.equipped.remove(slot);
                 pc.applyBonuses();
             }
         }

src/engine/objects/City.java

@@ -1197,14 +1197,18 @@ public class City extends AbstractWorldObject {
             // these assets are autoprotected.
 
             if ((cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.TOL) || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.SPIRE) || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.BARRACK) || (cityBuilding.getBlueprint().isWallPiece()) || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.SHRINE)) {
-
-                cityBuilding.claim(sourcePlayer);
+                PlayerCharacter guildLeader = PlayerCharacter.getPlayerCharacter(sourcePlayer.guild.getGuildLeaderUUID());
+                if(guildLeader != null)
+                    cityBuilding.claim(guildLeader);
+                else
+                    cityBuilding.claim(sourcePlayer);
                 cityBuilding.setProtectionState(ProtectionState.PROTECTED);
             }
         }
 
         this.setForceRename(true);
 
+
         // Reset city timer for map update
 
         City.lastCityUpdate = System.currentTimeMillis();

src/engine/objects/Resists.java

@@ -349,13 +349,13 @@ public class Resists {
             if (rb.getBool(ModType.ImmuneTo, SourceType.Stun))
                 this.immuneTo.put(mbEnums.DamageType.STUN, true);
             if (rb.getBool(ModType.ImmuneTo, SourceType.Blind))
-                this.immuneTo.put(mbEnums.DamageType.BLIND, true);
+                this.immuneTo.put(mbEnums.DamageType.BLINDNESS, true);
             if (rb.getBool(ModType.ImmuneToAttack, SourceType.None))
                 this.immuneTo.put(mbEnums.DamageType.ATTACK, true);
             if (rb.getBool(ModType.ImmuneToPowers, SourceType.None))
                 this.immuneTo.put(mbEnums.DamageType.POWERS, true);
             if (rb.getBool(ModType.ImmuneTo, SourceType.Powerblock))
-                this.immuneTo.put(mbEnums.DamageType.POWERBLOCK, true);
+                this.immuneTo.put(mbEnums.DamageType.POWERINHIBITOR, true);
             if (rb.getBool(ModType.ImmuneTo, SourceType.DeBuff))
                 this.immuneTo.put(mbEnums.DamageType.DEBUFF, true);
             if (rb.getBool(ModType.ImmuneTo, SourceType.Fear))

src/engine/powers/ActionsBase.java

@@ -11,13 +11,11 @@ package engine.powers;
 
 import engine.gameManager.DbManager;
 import engine.gameManager.PowersManager;
+import engine.mbEnums;
 import engine.mbEnums.ModType;
 import engine.mbEnums.SourceType;
 import engine.mbEnums.StackType;
-import engine.objects.AbstractCharacter;
-import engine.objects.AbstractWorldObject;
-import engine.objects.PlayerBonuses;
-import engine.objects.Runegate;
+import engine.objects.*;
 import engine.powers.poweractions.AbstractPowerAction;
 import org.pmw.tinylog.Logger;
 
@@ -244,32 +242,23 @@ public class ActionsBase {
     }
 
     //Add blocked types here
-    public boolean blocked(AbstractWorldObject awo, PowersBase pb, int trains) {
-        if (AbstractWorldObject.IsAbstractCharacter(awo)) {
-            AbstractCharacter ac = (AbstractCharacter) awo;
-            PlayerBonuses bonus = ac.getBonuses();
-            if (bonus == null)
-                return false;
+    public boolean blocked(AbstractWorldObject awo, boolean vampDrain) {
+        //Check for immunities
+        if (AbstractCharacter.IsAbstractCharacter(awo)){
+            AbstractCharacter pcTarget = (AbstractCharacter) awo;
+            PlayerBonuses bonus = pcTarget.getBonuses();
 
-            //TODO make this more efficient then testing strings
-            if (this.stackType.equals("Stun") && bonus.getBool(ModType.ImmuneTo, SourceType.STUN))
-                return true; //Currently stun immune. Skip stun
-            else if (this.stackType.equals("Snare") && bonus.getBool(ModType.ImmuneTo, SourceType.Snare))
-                return true; //Currently snare immune. Skip snare
-            else if (this.stackType.equals("Blindness") && bonus.getBool(ModType.ImmuneTo, SourceType.Blind))
-                return true; //Currently blind immune. Skip blind
-            else if (this.stackType.equals("PowerInhibitor") && bonus.getBool(ModType.ImmuneTo, SourceType.Powerblock))
-                return true; //Currently power block immune. Skip power block
-            else if (this.stackType.equals("Root") && bonus.getBool(ModType.ImmuneTo, SourceType.Root))
+            if(vampDrain)
+                return bonus.getBool(ModType.BlockedPowerType, SourceType.VAMPDRAIN);
+
+            if ((this.stackType.equals("Flight") && bonus.getBool(ModType.NoMod, SourceType.Fly)) ||
+                    (this.stackType.equals("Track") && bonus.getBool(ModType.CannotTrack, SourceType.None))) {
                 return true;
-                //			else if (pb.isHeal() && (bonus.getByte("immuneTo.Heal")) >= trains)
-                //				return true; //Currently shadowmantled. Skip heals
-            else if (this.stackType.equals("Flight") && bonus.getBool(ModType.NoMod, SourceType.Fly))
-                return true;
-            else if (this.stackType.equals("Track") && bonus.getBool(ModType.CannotTrack, SourceType.None))
-                return true;
-            else
-                return pb.vampDrain() && bonus.getBool(ModType.BlockedPowerType, SourceType.VAMPDRAIN);
+            }
+
+            mbEnums.DamageType damageType = mbEnums.DamageType.getDamageType(this.stackType.toUpperCase());
+            return pcTarget.getResists().immuneTo(damageType);
+
         }
         return false;
     }

src/engine/server/world/WorldServer.java

@@ -9,6 +9,7 @@
 
 package engine.server.world;
 
+import engine.ConfigParsing.EffectsParser;
 import engine.InterestManagement.RealmMap;
 import engine.InterestManagement.WorldGrid;
 import engine.db.archive.DataWarehouse;
@@ -76,7 +77,7 @@ public class WorldServer {
         super();
     }
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws IOException {
 
         WorldServer worldServer;
 
@@ -93,6 +94,8 @@ public class WorldServer {
             return;
         }
 
+        EffectsParser.init();
+
         try {
 
             worldServer = new WorldServer();