yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add entity passthrough to destination overrides

Browse Source
This commit is contained in:
ceikry
2021-08-25 17:55:42 -05:00
parent cea00a6998
commit 0dc59c29ba
9 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/interaction/MovementPulse.java
+4 -3
View File
@@ -14,6 +14,7 @@ import core.net.packet.PacketRepository;
import core.net.packet.context.PlayerContext;
import core.net.packet.out.ClearMinimapFlag;
import kotlin.jvm.functions.Function1;
import kotlin.jvm.functions.Function2;
import rs09.game.system.SystemLogger;
import java.util.Deque;
@@ -75,7 +76,7 @@ public abstract class MovementPulse extends Pulse {
*/
private boolean near;
private Function1<Node,Location> overrideMethod;
private Function2<Entity,Node,Location> overrideMethod;
/**
* Constructs a new {@code MovementPulse} {@code Object}.
@@ -145,7 +146,7 @@ public abstract class MovementPulse extends Pulse {
this.destinationFlag = destinationFlag;
}
public MovementPulse(Entity mover, Node destination, DestinationFlag destinationFlag, Function1<Node,Location> method){
public MovementPulse(Entity mover, Node destination, DestinationFlag destinationFlag, Function2<Entity,Node,Location> method){
this(mover,destination,null,false);
this.destinationFlag = destinationFlag;
this.overrideMethod = method;
@@ -241,7 +242,7 @@ public abstract class MovementPulse extends Pulse {
loc = destinationFlag.getDestination(mover, destination);
}
if(overrideMethod != null){
loc = overrideMethod.invoke(destination);
loc = overrideMethod.invoke(mover,destination);
if(loc == destination.getLocation()) loc = destinationFlag.getDestination(mover,destination);
}
if (loc == null && optionHandler != null) {
Server/src/main/java/core/game/interaction/npc/NPCTradePlugin.kt
+1 -1
View File
@@ -45,7 +45,7 @@ class NPCTradePlugin : InteractionListener() {
}
override fun defineDestinationOverrides() {
setDest(NPC,"trade","shop"){node ->
setDest(NPC,"trade","shop"){_,node ->
val npc = node as NPC
if (npc.getAttribute("facing_booth", false)) {
val offsetX = npc.direction.stepX shl 1