release-1.3 #13

Merged
MagicBot merged 40 commits from release-1.3 into master 2022-07-13 17:55:56 +00:00
Showing only changes of commit cd55105b28 - Show all commits
+3 -2
View File
@@ -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 {
player = PlayerCharacter.getFromCache(playerUUID);
if (this.isLocationOnCityZone(player.getLoc()))
if (this.isLocationWithinSiegeBounds(player.getLoc()))
continue;
// Remove players safezone status if warranted