yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug where some NPCs near the wilderness were incorrectly considered to be in the wilderness for aggression checks

Browse Source
This commit is contained in:
Ceikry
2022-12-23 02:09:24 +00:00
committed by Ryan
parent c9a6bf2f61
commit 5011b8648b
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/node/entity/npc/agg/AggressiveBehavior.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class AggressiveBehavior {
} }
if (entity instanceof NPC && target instanceof Player) { if (entity instanceof NPC && target instanceof Player) {
NPC npc = (NPC) entity; NPC npc = (NPC) entity;
if (npc.getAggressiveHandler() != null && npc.getAggressiveHandler().isAllowTolerance() && WildernessZone.getWilderness(npc) == -1) { if (npc.getAggressiveHandler() != null && npc.getAggressiveHandler().isAllowTolerance() && !WildernessZone.isInZone(npc)) {
if (RegionManager.forId(regionId).isTolerated(target.asPlayer())) { if (RegionManager.forId(regionId).isTolerated(target.asPlayer())) {
return false; return false;
} }
Server/src/main/java/core/game/world/map/zone/impl/WildernessZone.java
+2 -3
View File
@@ -296,11 +296,10 @@ public final class WildernessZone extends MapZone {
*/ */
public static boolean isInZone(Entity e) { public static boolean isInZone(Entity e) {
Location l = e.getLocation(); Location l = e.getLocation();
for (RegionZone zone : e.getViewport().getRegion().getRegionZones()) { for (ZoneBorders z : INSTANCE.borders) {
if (zone.getZone() == INSTANCE && zone.getBorders().insideBorder(l.getX(), l.getY())) { if (z.insideBorder(e))
return true; return true;
} }
}
return false; return false;
} }