2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2026-08-28 05:45:10 -06:00
Code Issues Projects Releases Packages Wiki Activity

Revert overengineered AI slop fix

Browse source
This commit is contained in:
Player Name 2026-06-28 21:26:57 +02:00
parent 8af95dbd4d
commit 81faf292cc
2 changed files with 4 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Server/src/main/core/game/node/entity/player/Player.java
View file

@ -380,10 +380,6 @@ public class Player extends Entity {
}
interfaceManager.close();
interfaceManager.closeSingleTab();
if (getAttribute("region-viewcounted", false)) {
RegionManager.decrementViewBlock(getLocation().getRegionX(), getLocation().getRegionY());
removeAttribute("region-viewcounted");
}
super.clear();
getZoneMonitor().clear();
HouseManager.leave(this);

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

@ -399,50 +399,23 @@ object RegionManager {
when (entity) {
is Player -> {
src.chunk.removePlayer(entity)
src.region.decrementViewAmount()
dst.chunk.addPlayer(entity)
// Compare at region granularity to detect a region (not just chunk) change.
if ((src.regionX shr 3) != (dst.regionX shr 3) || (src.regionY shr 3) != (dst.regionY shr 3)) {
if (entity.getAttribute("region-viewcounted", false)) {
forViewedRegions(src.regionX, src.regionY) { it.decrementViewAmount(); it.checkInactive() }
}
forViewedRegions(dst.regionX, dst.regionY) { it.incrementViewAmount(); it.flagActive() }
entity.setAttribute("region-viewcounted", true)
}
dst.region.incrementViewAmount()
dst.region.flagActive()
}
is NPC -> {
src.chunk.remove(entity)
dst.chunk.add(entity)
}
else -> {
throw IllegalStateException("Tried to move an Entity that was neither Player nor NPC")
throw (IllegalStateException("Tried to move an Entity that was neither Player nor NPC"))
}
}
}
entity.zoneMonitor.updateLocation(entity.walkingQueue.footPrint)
}
/**
* Iterates the 3x3 block of regions surrounding the region containing the given chunk coordinates,
* running the action on each. Mirrors the pre-MR view-counting loop.
* @param chunkRegionX chunk-granularity x (i.e. Location.regionX, which is x >> 3).
* @param chunkRegionY chunk-granularity y (i.e. Location.regionY, which is y >> 3).
*/
private inline fun forViewedRegions(chunkRegionX: Int, chunkRegionY: Int, action: (Region) -> Unit) {
val regionX = chunkRegionX shr 3 // chunk -> region granularity
val regionY = chunkRegionY shr 3
for (rx in (regionX - 1)..(regionX + 1)) {
for (ry in (regionY - 1)..(regionY + 1)) {
if (rx < 0 || ry < 0) continue
action(forId((rx shl 8) or ry))
}
}
}
@JvmStatic
fun decrementViewBlock(chunkRegionX: Int, chunkRegionY: Int) {
forViewedRegions(chunkRegionX, chunkRegionY) { it.decrementViewAmount(); it.checkInactive() }
}
/**
* Gets local entities. You never call the below function directly (it's inlined); instead, you use one of the typed helpers defined directly below this function.
* @param location the location.