From 0a303dfde930bb58a13d162a3aa810be7eeb0f88 Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Sat, 24 Nov 2018 20:48:21 -0500
Subject: [PATCH] Make absolute sure spbplace is set in the right places

---
 src/p_enemy.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/p_enemy.c b/src/p_enemy.c
index d8735d9bb..6e8668b8a 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -8469,7 +8469,11 @@ void A_SPBChase(mobj_t *actor)
 	else if (actor->extravalue1 == 2) // MODE: WAIT...
 	{
 		actor->momx = actor->momy = actor->momz = 0; // Stoooop
-		spbplace = -1;
+
+		if (actor->lastlook == -1)
+			spbplace = -1;
+		else
+			spbplace = players[actor->lastlook].kartstuff[k_position];
 
 		if (actor->extravalue2-- <= 0)
 		{
@@ -8487,7 +8491,6 @@ void A_SPBChase(mobj_t *actor)
 	else // MODE: SEEKING
 	{
 		actor->lastlook = -1; // Just make sure this is reset
-		spbplace = -1;
 
 		// Find the player with the best rank
 		for (i = 0; i < MAXPLAYERS; i++)
@@ -8511,6 +8514,8 @@ void A_SPBChase(mobj_t *actor)
 			}
 		}
 
+		spbplace = bestrank; // While seeking, it's trying to go for first place.
+
 		// No one there?
 		if (player == NULL || !player->mo)
 		{