Browse Source

allow deleting shrines by players

lakebane-jobs
FatBoy-DOTC 3 days ago
parent
commit
1ef18490b5
  1. 6
      src/engine/net/client/handlers/DestroyBuildingHandler.java
  2. 8
      src/engine/net/client/msg/ManageCityAssetsMsg.java

6
src/engine/net/client/handlers/DestroyBuildingHandler.java

@ -54,7 +54,7 @@ public class DestroyBuildingHandler extends AbstractClientMsgHandler { @@ -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 { @@ -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

8
src/engine/net/client/msg/ManageCityAssetsMsg.java

@ -567,8 +567,12 @@ public class ManageCityAssetsMsg extends ClientNetMsg { @@ -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

Loading…
Cancel
Save