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

Null safety MR changes

Browse source
This commit is contained in:
dam 2026-05-28 19:20:22 +03:00
parent a9d6ce021b
commit 32b11a9e87
No known key found for this signature in database
GPG key ID: 4AF4E722399663FB
2 changed files with 72 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Server/src/main/core/game/interaction/MovementPulse.java
View file

@ -236,7 +236,7 @@ public abstract class MovementPulse extends Pulse {
private boolean tryInteract() {
Location ml = mover.getLocation();
if (interactLocation == null) return false;
if (ml == null || interactLocation == null) return false;
boolean atInteractLocation = ml.equals(interactLocation);
if (destination instanceof Entity) {
boolean canInteractFromCurrentPosition = canInteractWithEntityFromCurrentPosition((Entity) destination);
@ -282,7 +282,13 @@ public abstract class MovementPulse extends Pulse {
}
private boolean canInteractWithEntityFrom(Location source, Entity target) {
if (source == null || target == null) {
return false;
}
Location dl = target.getLocation();
if (dl == null) {
return false;
}
if (source.getZ() != dl.getZ()) {
return false;
}
@ -354,7 +360,7 @@ public abstract class MovementPulse extends Pulse {
if (mover instanceof NPC && mover.asNpc().isNeverWalks()) {
return;
}
if (destination == null || destination.getLocation() == null) {
if (mover.getLocation() == null || destination == null || destination.getLocation() == null) {
return;
}
@ -520,7 +526,13 @@ public abstract class MovementPulse extends Pulse {
}
private boolean overlapsEntityFootprint(Location source, Entity target) {
if (source == null || target == null) {
return false;
}
Location targetLocation = target.getLocation();
if (targetLocation == null) {
return false;
}
return Pathfinder.isStandingIn(source.getX(),
source.getY(),
mover.size(),
@ -643,6 +655,9 @@ public abstract class MovementPulse extends Pulse {
* @return {@code True} if so.
*/
private boolean isInsideEntity(Location l) {
if (l == null) {
return false;
}
if (!(destination instanceof Entity)) {
return false;
}
@ -650,6 +665,9 @@ public abstract class MovementPulse extends Pulse {
return false;
}
Location loc = destination.getLocation();
if (loc == null) {
return false;
}
int size = destination.size();
return Pathfinder.isStandingIn(l.getX(), l.getY(), mover.size(), mover.size(), loc.getX(), loc.getY(), size, size);
}

52
Server/src/test/kotlin/core/PathfinderTests.kt
View file

@ -378,6 +378,58 @@ class PathfinderTests {
}
}
@Test
fun entityMovementPulseShouldIgnoreMissingTargetLocation() {
TestUtils.getMockPlayer("missingTargetLocationGuard").use { p ->
val npc = NPC.create(0, NPC_TEST_LOC)
npc.init()
val originalNpcLocation = npc.location
var pulsed = false
try {
npc.location = null
val pulse = object : MovementPulse(p, npc) {
override fun pulse(): Boolean {
pulsed = true
return true
}
}
Assertions.assertFalse(pulse.update())
Assertions.assertFalse(pulsed)
} finally {
npc.location = originalNpcLocation
npc.clear()
}
}
}
@Test
fun entityMovementPulseShouldIgnoreMissingMoverLocation() {
TestUtils.getMockPlayer("missingMoverLocationGuard").use { p ->
val npc = NPC.create(0, NPC_TEST_LOC)
npc.init()
val locationField = Node::class.java.getDeclaredField("location")
locationField.isAccessible = true
val originalPlayerLocation = p.location
var pulsed = false
try {
locationField.set(p, null)
val pulse = object : MovementPulse(p, npc) {
override fun pulse(): Boolean {
pulsed = true
return true
}
}
Assertions.assertFalse(pulse.update())
Assertions.assertFalse(pulsed)
} finally {
locationField.set(p, originalPlayerLocation)
npc.clear()
}
}
}
@Test
fun runEnabledEntityMovementPulseShouldCatchWalkingNpcMovingDirectlyAway() {
TestUtils.getMockPlayer("runNpcInteractionChaser").use { p ->