MagicBane/Server
Template
434
1
Fork 5
Code Issues 6 Pull Requests Projects Releases Wiki Activity

release-1.3 #13

Merged
MagicBot merged 40 commits from release-1.3 into master 2022-07-13 17:55:56 +00:00
Conversation 0 Commits 40 Files Changed 23
+3 -2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d9b5544894 - Show all commits
src/engine/net/client/handlers/DestroyBuildingHandler.java
+3 -2
View File
@@ -8,6 +8,7 @@ import engine.gameManager.BuildingManager;
import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.DestroyBuildingMsg;
import engine.net.client.msg.ErrorPopupMsg;
import engine.net.client.msg.PlaceAssetMsg;
import engine.objects.*;
@@ -56,8 +57,8 @@ public class DestroyBuildingHandler extends AbstractClientMsgHandler {
if (!BuildingManager.PlayerCanControlNotOwner(building, pc))
return true;
Bane bane = city.getBane();
if(bane.getSiegePhase() == Enum.SiegePhase.WAR && bane != null) {
PlaceAssetMsg.sendPlaceAssetError(origin, 171, pc.getName());
if(bane.getSiegePhase() != Enum.SiegePhase.WAR && bane != null) {
ErrorPopupMsg.sendErrorPopup(pc, 171);
return true;
}
// Can't destroy a tree of life