boxed character fix, safezone equipment damage fix, trade fix, creation experience fix, sub guild limits removed

2024-02-11 09:36:10 -06:00
parent 6641651f3c
commit 668df83e33
4 changed files with 39 additions and 15 deletions
@@ -730,32 +730,29 @@ public class Guild extends AbstractWorldObject {

    public boolean canSubAGuild(Guild toSub) {

-        boolean canSub;
-
+        boolean canSubToNation;
+        boolean canAcceptSub;
        if (this.equals(toSub))
            return false;
        switch (this.guildState) {
            case Nation:
            case Sovereign:
-                canSub = true;
+                canAcceptSub = true;
                break;
            default:
-                canSub = false;
+                canAcceptSub = false;
        }

        switch (toSub.guildState) {
            case Errant:
            case Sovereign:
-                canSub = true;
+                canSubToNation = true;
                break;
            default:
-                canSub = false;
+                canSubToNation = false;
        }
-        City nationCap = City.getCity(nation.cityUUID);
-        if (nation.getSubGuildList().size() >= nationCap.getRank()) {
-            canSub = false;
-        }
-        return canSub;
+
+        return canAcceptSub && canSubToNation;
    }

    public int getRealmsOwnedFlag() {