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 18bf19502f - Show all commits
+2 -4
View File
@@ -999,11 +999,9 @@ public class City extends AbstractWorldObject {
HashSet<Integer> currentMemory;
PlayerCharacter player;
// Gather current list of players within a distance defined by the x extent of the
// city zone. As we want to grab all players with even a remote possibility of
// being in the zone, we might have to increase this distance.
// Gather current list of players within a distance defined by the seige bounds
currentPlayers = WorldGrid.getObjectsInRangePartial(this.location, this.parentZone.getBounds().getHalfExtents().x * 1.41421356237, MBServerStatics.MASK_PLAYER);
currentPlayers = WorldGrid.getObjectsInRangePartial(this.location, CityBoundsType.SIEGE.extents, MBServerStatics.MASK_PLAYER);
currentMemory = new HashSet<>();
for (AbstractWorldObject playerObject : currentPlayers) {