|  |  | @ -1017,7 +1017,7 @@ public class City extends AbstractWorldObject { | 
			
		
	
		
		
			
				
					
					|  |  |  | 			if (_playerMemory.contains(player.getObjectUUID())) |  |  |  | 			if (_playerMemory.contains(player.getObjectUUID())) | 
			
		
	
		
		
			
				
					
					|  |  |  | 				continue; |  |  |  | 				continue; | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | 			if (!this.isLocationOnCityZone(player.getLoc())) |  |  |  | 			if (!this.isLocationWithinSiegeBounds(player.getLoc())) | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  | 				continue; |  |  |  | 				continue; | 
			
		
	
		
		
			
				
					
					|  |  |  | 			// Apply safehold affect to player if needed
 |  |  |  | 			// Apply safehold affect to player if needed
 | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
	
		
		
			
				
					|  |  | @ -1062,7 +1062,8 @@ public class City extends AbstractWorldObject { | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | 			player = PlayerCharacter.getFromCache(playerUUID); |  |  |  | 			player = PlayerCharacter.getFromCache(playerUUID); | 
			
		
	
		
		
			
				
					
					|  |  |  | 			if (this.isLocationOnCityZone(player.getLoc())) |  |  |  | 
 | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | 			if (this.isLocationWithinSiegeBounds(player.getLoc())) | 
			
		
	
		
		
			
				
					
					|  |  |  | 				continue; |  |  |  | 				continue; | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | 			// Remove players safezone status if warranted
 |  |  |  | 			// Remove players safezone status if warranted
 | 
			
		
	
	
		
		
			
				
					|  |  | 
 |