Fix touch called with endtouch on mapping api triggers

This would have teleported you twice and would mess up relative teleport triggers
KZGlobalTeam · Oct 30, 2024 · 3d8f583 · 3d8f583
1 parent d45ff10
commit 3d8f583
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/src/kz/trigger/callbacks.cpp b/src/kz/trigger/callbacks.cpp
@@ -143,7 +143,6 @@ void KZTriggerService::OnMappingApiTriggerStartTouchPost(TriggerTouchTracker tra
 		}
 		break;
 
-		case KZTRIGGER_ANTI_BHOP:
 		case KZTRIGGER_TELEPORT:
 		case KZTRIGGER_MULTI_BHOP:
 		case KZTRIGGER_SINGLE_BHOP:
@@ -225,7 +224,6 @@ void KZTriggerService::OnMappingApiTriggerEndTouchPost(TriggerTouchTracker track
 		break;
 
 		case KZTRIGGER_TELEPORT:
-		case KZTRIGGER_ANTI_BHOP:
 		case KZTRIGGER_MULTI_BHOP:
 		case KZTRIGGER_SINGLE_BHOP:
 		case KZTRIGGER_SEQUENTIAL_BHOP:

diff --git a/src/kz/trigger/kz_trigger.h b/src/kz/trigger/kz_trigger.h
@@ -163,7 +163,7 @@ class KZTriggerService : public KZBaseService
 	static bool ShouldTouchBeforeEndTouch(TriggerTouchTracker tracker)
 	{
 		// TODO: Let mapping API decide whether it is not the case.
-		return true;
+		return !tracker.kzTrigger;
 	}
 
 	// Whether Touch should be called on every possible change in origin.

diff --git a/src/kz/trigger/mapping_api.cpp b/src/kz/trigger/mapping_api.cpp
@@ -208,7 +208,7 @@ bool KZTriggerService::TouchTeleportTrigger(TriggerTouchTracker tracker)
 
 	this->player->SetOrigin(finalOrigin);
 
-	return shouldTeleport;
+	return true;
 }
 
 void KZTriggerService::ApplySlide(bool replicate)