From 4799176c14f7d8a542ecfdc1e0034e28e2617b32 Mon Sep 17 00:00:00 2001
From: Player Name <esonketdc@mozmail.com>
Date: Sun, 6 Oct 2024 11:03:33 +0000
Subject: [PATCH] Fix bugs with familiars

Fixed a bug where familiars would sometimes not respond to the 'Call' button
Fixed random events not spawning when standing in front of the Lumbridge furnace
Fixed incorrect restrictions on familiars and random events inside POHs
---
 .../global/skill/construction/HouseZone.java  |  2 +-
 .../main/core/game/world/map/RegionManager.kt | 36 +++++++++++++------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/Server/src/main/content/global/skill/construction/HouseZone.java b/Server/src/main/content/global/skill/construction/HouseZone.java
index dd0075f23..7157912ae 100644
--- a/Server/src/main/content/global/skill/construction/HouseZone.java
+++ b/Server/src/main/content/global/skill/construction/HouseZone.java
@@ -37,7 +37,7 @@ public final class HouseZone extends MapZone {
      * Constructs the house zone object.
      */
     public HouseZone(HouseManager house) {
-        super("poh-zone" + house, true, ZoneRestriction.RANDOM_EVENTS, ZoneRestriction.FOLLOWERS);
+        super("poh-zone" + house, true);
         this.house = house;
     }
 
diff --git a/Server/src/main/core/game/world/map/RegionManager.kt b/Server/src/main/core/game/world/map/RegionManager.kt
index 91ccf4f25..46022fd01 100644
--- a/Server/src/main/core/game/world/map/RegionManager.kt
+++ b/Server/src/main/core/game/world/map/RegionManager.kt
@@ -312,23 +312,37 @@ object RegionManager {
         if (owner == null || node == null) {
             return null
         }
-        var destination: Location? = null
         outer@ for (i in 0..7) {
             val dir = Direction.get(i)
-            inner@for(j in 0 until node.size()) {
-                val l = owner.location.transform(dir, j)
-                for (x in 0 until node.size()) {
-                    for (y in 0 until node.size()) {
-                        if (isClipped(l.transform(x, y, 0))) {
-                            continue@inner
-                        }
+            var stepX = dir.stepX
+            var stepY = dir.stepY
+            // For objects that are larger than 1, the below corrects for the fact that their origin is on the SW tile
+            if (dir.stepX < 0) {
+                stepX -= (node.size() - 1)
+            }
+            if (dir.stepY < 0) {
+                stepY -= (node.size() - 1)
+            }
+            if (owner.size() > 1) { //e.g. if you used ::pnpc to morph yourself into a large NPC
+                if (dir.stepX > 0) {
+                    stepX += (owner.size() - 1)
+                }
+                if (dir.stepY > 0) {
+                    stepY += (owner.size() - 1)
+                }
+            }
+            val l = owner.location.transform(stepX, stepY, 0)
+            // Check if ALL target tiles are unclipped
+            for (x in 0 until node.size()) {
+                for (y in 0 until node.size()) {
+                    if (isClipped(l.transform(x, y, 0))) {
+                        continue@outer
                     }
                 }
-                destination = l
-                break@outer
             }
+            return l
         }
-        return destination
+        return null
     }
 
     /**