From b9f5c807535e30ce277a39a5bec6c479282bb9d4 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Fri, 9 Sep 2022 07:58:17 -0500 Subject: [PATCH] Less bad isInZone method --- .../core/game/world/map/zone/impl/WildernessZone.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Server/src/main/java/core/game/world/map/zone/impl/WildernessZone.java b/Server/src/main/java/core/game/world/map/zone/impl/WildernessZone.java index 6518c68b9..04ef5cf2e 100644 --- a/Server/src/main/java/core/game/world/map/zone/impl/WildernessZone.java +++ b/Server/src/main/java/core/game/world/map/zone/impl/WildernessZone.java @@ -289,21 +289,19 @@ public final class WildernessZone extends MapZone { } } + /** * Checks if the entity is inside the wilderness. * @param e The entity. * @return {@code True} if so. */ public static boolean isInZone(Entity e) { - Location l = e.getLocation(); - for (RegionZone zone : e.getViewport().getRegion().getRegionZones()) { - if (zone.getZone() == INSTANCE && zone.getBorders().insideBorder(l.getX(), l.getY())) { + for (ZoneBorders border : INSTANCE.borders) { + if (border.insideBorder(e)) return true; - } } return false; } - /** * The wilderness level. * @return the level.