diff --git a/src/engine/objects/Building.java b/src/engine/objects/Building.java index 9535411f..ccc24963 100644 --- a/src/engine/objects/Building.java +++ b/src/engine/objects/Building.java @@ -869,13 +869,8 @@ public class Building extends AbstractWorldObject { DispatchMessage.sendToAllInRange(this, applyBuildingEffectMsg); } - /* - * Utils - */ - public void removeEffectBit(int bit) { this.effectFlags &= (~bit); - } @Override @@ -892,11 +887,6 @@ public class Building extends AbstractWorldObject { this.updateName(); } - - /* - * Serializing - */ - public final AbstractCharacter getOwner() { if (this.ownerUUID == 0) @@ -908,10 +898,6 @@ public class Building extends AbstractWorldObject { } - /* - * Database - */ - public final String getOwnerName() { AbstractCharacter owner = this.getOwner(); if (owner != null) @@ -972,13 +958,11 @@ public class Building extends AbstractWorldObject { } - // *** Refactor: Can't we just use setRank() for this? - public final void rebuildMine() { this.setRank(1); this.meshUUID = this.getBlueprint().getMeshForRank(this.rank); - // New rank mean new max hitpoints. + // New rank mean new max hit points. this.healthMax = this.getBlueprint().getMaxHealth(this.rank); this.setCurrentHitPoints(this.healthMax); @@ -996,8 +980,6 @@ public class Building extends AbstractWorldObject { return maxGold; } - //This returns if a player is allowed access to control the building - @Override public void runAfterLoad() { @@ -1184,7 +1166,6 @@ public class Building extends AbstractWorldObject { this.ownerIsNPC = (newOwner.getObjectType() == GameObjectType.NPC); } - // Set new guild for hirelings and refresh all clients this.refreshGuild(); @@ -1304,7 +1285,7 @@ public class Building extends AbstractWorldObject { } // Save to database ? - if (updateRecord == true) + if (updateRecord) return DbManager.BuildingQueries.UPDATE_DOOR_LOCK(this.getObjectUUID(), this.doorState); else return true; @@ -1340,7 +1321,6 @@ public class Building extends AbstractWorldObject { this.spireIsActive = true; this.updateEffects(); - } public final void disableSpire(boolean refreshEffect) { @@ -1629,18 +1609,10 @@ public class Building extends AbstractWorldObject { return patrolPoints; } - public void setPatrolPoints(ArrayList patrolPoints) { - this.patrolPoints = patrolPoints; - } - public ArrayList getSentryPoints() { return sentryPoints; } - public void setSentryPoints(ArrayList sentryPoints) { - this.sentryPoints = sentryPoints; - } - public synchronized boolean addProtectionTax(Building building, PlayerCharacter pc, final TaxType taxType, int amount, boolean enforceKOS) { if (building == null) return false; @@ -1665,14 +1637,6 @@ public class Building extends AbstractWorldObject { } - public synchronized boolean declineTaxOffer() { - return true; - } - - public synchronized boolean acceptTaxOffer() { - return true; - } - public synchronized boolean acceptTaxes() { if (!DbManager.BuildingQueries.acceptTaxes(this)) @@ -1697,14 +1661,6 @@ public class Building extends AbstractWorldObject { return true; } - public boolean isTaxed() { - if (this.taxType == TaxType.NONE) - return false; - if (this.taxAmount == 0) - return false; - return this.taxDateTime != null; - } - public void AddToBarracksList() { City playerCity = ZoneManager.getCityAtLocation(this.loc); if (playerCity != null) {