2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-09 16:45:44 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fix bugs with familiars

Browse source 
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
This commit is contained in:
Player Name 2024-10-06 11:03:33 +00:00 • committed by Ryan
parent 0a89439c80
commit 4799176c14
2 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Server/src/main/content/global/skill/construction/HouseZone.java
View file

@ -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;
}

36
Server/src/main/core/game/world/map/RegionManager.kt
View file

@ -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
}
/**