Merge branch 'magicbox1.5' into feature-guard-patrol

src/engine/net/client/handlers/PlaceAssetMsgHandler.java

@@ -346,11 +346,6 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 			return false;
 		}
 
-		// Set the server zone to the city zone in order to account for being inside
-		// the siege bounds buffer area
-
-		serverZone = serverCity.getParent();
-
 		// Must belong to either attacker or defenders.
 
 		if ((player.getGuild().equals(serverCity.getBane().getOwner().getGuild()) == false)
@@ -427,7 +422,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 				if (!building.getBlueprint().isSiegeEquip())
 					continue;
 
-			if (!building.getLoc().isInsideCircle(serverCity.getLoc(), Enum.CityBoundsType.SIEGE.extents))
+			if (!building.getLoc().isInsideCircle(serverCity.getLoc(), CityBoundsType.ZONE.extents))
 				continue;
 
 			if (building.getGuild() == null)
@@ -929,28 +924,6 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 		DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
 	}
 
-	// Method deletes one item from the player's inventory
-	// based on the mesh UUID the deed/seed spawns
-
-	private static void removeDeedByMeshUUID(PlayerCharacter player, int meshUUID) {
-
-		CharacterItemManager inventoryManager;
-		ArrayList<Item> itemList;
-
-		inventoryManager = player.getCharItemManager();
-		itemList = player.getInventory();
-
-		for (Item inventoryItem : itemList) {
-			if (inventoryItem.getItemBase().getUseID() == meshUUID) {
-				inventoryManager.delete(inventoryItem);
-
-				inventoryManager.updateInventory();
-				return;
-			}
-
-		}
-	}
-
 	// Method validates the location we have selected for our new city
 
 	private static boolean validateTreeOfLifePlacement(PlayerCharacter playerCharacter, Realm serverRealm, Zone serverZone,