diff --git a/src/engine/net/client/handlers/DestroyBuildingHandler.java b/src/engine/net/client/handlers/DestroyBuildingHandler.java index 418601bc..11d1a4f8 100644 --- a/src/engine/net/client/handlers/DestroyBuildingHandler.java +++ b/src/engine/net/client/handlers/DestroyBuildingHandler.java @@ -54,7 +54,7 @@ public class DestroyBuildingHandler extends AbstractClientMsgHandler { return true; } - if (!BuildingManager.PlayerCanControlNotOwner(building, pc)) + if (!BuildingManager.PlayerCanControlNotOwner(building, pc) && !pc.getAccount().status.equals(Enum.AccountStatus.ADMIN)) return true; // Can't delete siege assets during an active bane. @@ -72,8 +72,8 @@ public class DestroyBuildingHandler extends AbstractClientMsgHandler { return true; // Can't destroy a shrine - if (blueprint.getBuildingGroup() == BuildingGroup.SHRINE) - return true; + //if (blueprint.getBuildingGroup() == BuildingGroup.SHRINE) + // return true; // Cannot destroy mines outside of normal mine mechanics diff --git a/src/engine/net/client/msg/ManageCityAssetsMsg.java b/src/engine/net/client/msg/ManageCityAssetsMsg.java index c4cae32b..8decdb75 100644 --- a/src/engine/net/client/msg/ManageCityAssetsMsg.java +++ b/src/engine/net/client/msg/ManageCityAssetsMsg.java @@ -567,8 +567,12 @@ public class ManageCityAssetsMsg extends ClientNetMsg { writer.put(labelSiege);// 1 sets the protection under siege writer.put(labelCeaseFire); //0 with 1 set above sets to under siege // 1 with 1 set above sets protection status to under siege(cease fire) - writer.put(buttonTransfer);// 1 enables the transfer asset button - writer.put(buttonDestroy);// 1 enables the destroy asset button + writer.put(buttonTransfer); + if(building.getBlueprint() != null && building.getBlueprint().getBuildingGroup() != null && building.getBlueprint().getBuildingGroup().equals(BuildingGroup.SHRINE)) {// 1 enables the transfer asset button + writer.put((byte)1); + }else { + writer.put(buttonDestroy);// 1 enables the destroy asset button + } writer.put(buttonAbandon);// 1 here enables the abandon asset button writer.put(buttonUpgrade); //disable upgrade building