diff --git a/src/engine/net/client/handlers/PlaceAssetMsgHandler.java b/src/engine/net/client/handlers/PlaceAssetMsgHandler.java index dee6a698..17730f07 100644 --- a/src/engine/net/client/handlers/PlaceAssetMsgHandler.java +++ b/src/engine/net/client/handlers/PlaceAssetMsgHandler.java @@ -568,7 +568,15 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler { return false; } - serverCity = ZoneManager.getCityAtLocation(buildingList.getLoc()); + //serverCity = ZoneManager.getCityAtLocation(buildingList.getLoc()); + Bane validBane = null; + serverCity = null; + for(Bane b : Bane.banes.values()){ + if(b.getOwner().guild.equals(player.guild)){ + serverCity = b.getCity(); + } + } + // No valid player city found diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index c4daf0ca..1a88cff9 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -5216,7 +5216,7 @@ public class PlayerCharacter extends AbstractCharacter { //DS: 1672601862 if(this.isBoxed){ - if(this.getPromotionClassID() == 0) {//fury cannot be PVE anymore, fuck them + if(this.getPromotionClassID() == 2511) {//fury cannot be PVE anymore, fuck them if (!this.containsEffect(1672601862)) PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false); }else { @@ -5224,7 +5224,7 @@ public class PlayerCharacter extends AbstractCharacter { PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, -935138707, 40, false); } }else{ - if(this.getPromotionClassID() == 0) {//fury cannot be PVE anymore, fuck them + if(this.getPromotionClassID() == 2511) {//fury cannot be PVE anymore, fuck them if (this.containsEffect(1672601862)) { this.removeEffectBySource(EffectSourceType.DeathShroud,41,false); }