Tomm0017 · ThatGamerBlue · Jul 3, 2019
diff --git a/game/src/main/kotlin/gg/rsmod/game/model/MovementQueue.kt b/game/src/main/kotlin/gg/rsmod/game/model/MovementQueue.kt
@@ -43,8 +43,8 @@ class MovementQueue(val pawn: Pawn) {
         val collision = pawn.world.collision
 
         var next = steps.poll()
+        var tile = pawn.tile
         if (next != null) {
-            var tile = pawn.tile
 
             var walkDirection: Direction?
             var runDirection: Direction? = null
@@ -81,12 +81,12 @@ class MovementQueue(val pawn: Pawn) {
 
             if (walkDirection != null && walkDirection != Direction.NONE) {
                 pawn.steps = StepDirection(walkDirection, runDirection)
-                pawn.tile = Tile(tile)
                 if (runDirection != null) {
                     pawn.addBlock(UpdateBlockType.MOVEMENT)
                 }
             }
         }
+        pawn.tile = Tile(tile)
     }
 
     private fun addStep(current: Tile, next: Tile, type: StepType, detectCollision: Boolean) {

diff --git a/game/src/main/kotlin/gg/rsmod/game/model/entity/Entity.kt b/game/src/main/kotlin/gg/rsmod/game/model/entity/Entity.kt
@@ -14,7 +14,7 @@ abstract class Entity {
     /**
      * The current 3D [Tile] that this [Pawn] is standing on in the [World].
      */
-    lateinit var tile: Tile
+    open lateinit var tile: Tile
 
     abstract val entityType: EntityType
 

diff --git a/game/src/main/kotlin/gg/rsmod/game/model/entity/Npc.kt b/game/src/main/kotlin/gg/rsmod/game/model/entity/Npc.kt
@@ -137,6 +137,7 @@ class Npc private constructor(val id: Int, world: World, val spawnTile: Tile) :
             timerCycle()
         }
         hitsCycle()
+        updateLastTile()
     }
 
     /**

diff --git a/game/src/main/kotlin/gg/rsmod/game/model/entity/Pawn.kt b/game/src/main/kotlin/gg/rsmod/game/model/entity/Pawn.kt
@@ -52,11 +52,19 @@ abstract class Pawn(val world: World) : Entity() {
      */
     internal var blockBuffer = UpdateBlockBuffer()
 
+    override var tile: Tile = Tile(0, 0, 0)
+        set(value) {
+            lastTileBuffer = field
+            field = value
+        }
+
     /**
      * The 3D [Tile] that this pawn was standing on, in the last game cycle.
      */
     internal var lastTile: Tile? = null
 
+    private var lastTileBuffer: Tile? = null
+
     /**
      * The last tile that was set for the pawn's [gg.rsmod.game.model.region.Chunk].
      */
@@ -151,6 +159,10 @@ abstract class Pawn(val world: World) : Entity() {
      */
     abstract fun cycle()
 
+    fun updateLastTile() {
+        lastTile = lastTileBuffer
+    }
+
     fun isDead(): Boolean = getCurrentHp() == 0
 
     fun isAlive(): Boolean = !isDead()

diff --git a/game/src/main/kotlin/gg/rsmod/game/model/entity/Player.kt b/game/src/main/kotlin/gg/rsmod/game/model/entity/Player.kt
@@ -237,7 +237,6 @@ open class Player(world: World) : Pawn(world) {
         movementQueue.clear()
         lock = LockState.DELAY_ACTIONS
 
-        lastTile = Tile(tile)
         moveTo(movement.finalDestination)
 
         forceMove(movement)
@@ -366,6 +365,7 @@ open class Player(world: World) : Pawn(world) {
      * conditions if any logic may modify other [Pawn]s.
      */
     fun postCycle() {
+        updateLastTile()
         /*
          * Flush the channel at the end.
          */

diff --git a/game/src/main/kotlin/gg/rsmod/game/sync/task/NpcPostSynchronizationTask.kt b/game/src/main/kotlin/gg/rsmod/game/sync/task/NpcPostSynchronizationTask.kt
@@ -13,9 +13,6 @@ object NpcPostSynchronizationTask : SynchronizationTask<Npc> {
         val oldTile = pawn.lastTile
         val moved = oldTile == null || !oldTile.sameAs(pawn.tile)
 
-        if (moved) {
-            pawn.lastTile = Tile(pawn.tile)
-        }
         pawn.moved = false
         pawn.steps = null
         pawn.blockBuffer.clean()

diff --git a/game/src/main/kotlin/gg/rsmod/game/sync/task/PlayerPostSynchronizationTask.kt b/game/src/main/kotlin/gg/rsmod/game/sync/task/PlayerPostSynchronizationTask.kt
@@ -1,6 +1,5 @@
 package gg.rsmod.game.sync.task
 
-import gg.rsmod.game.model.Tile
 import gg.rsmod.game.model.entity.Player
 import gg.rsmod.game.service.GameService
 import gg.rsmod.game.sync.SynchronizationTask
@@ -16,9 +15,6 @@ object PlayerPostSynchronizationTask : SynchronizationTask<Player> {
         val moved = oldTile == null || !oldTile.sameAs(pawn.tile)
         val changedHeight = oldTile?.height != pawn.tile.height
 
-        if (moved) {
-            pawn.lastTile = Tile(pawn.tile)
-        }
         pawn.moved = false
         pawn.steps = null
         pawn.blockBuffer.clean()
-Original file line number
+Diff line change
@@ Expand Up @@
                 timerCycle()
             }
             hitsCycle()
+            updateLastTile()
         }
         /**
@@ Expand Down @@