claiming an errant ToL gives ownership to the leader of the guild, not individual player

2024-06-26 19:44:23 -05:00
parent 80ccfff635
commit 79919121a8
1 changed files with 6 additions and 2 deletions
@@ -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();