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