From: Nick S <nick@teichisma.info>
Date: Thu, 29 Jun 2023 21:52:07 +0000 (+0300)
Subject: Unbreak the merge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=efe77d9fc618bb8f89b28bb062ebf523a3bcd670;p=xonotic%2Fxonotic-data.pk3dir.git

Unbreak the merge
---

diff --git a/qcsrc/common/mapobjects/trigger/jumppads.qc b/qcsrc/common/mapobjects/trigger/jumppads.qc
index 4dc6850574..f7281e5e4a 100644
--- a/qcsrc/common/mapobjects/trigger/jumppads.qc
+++ b/qcsrc/common/mapobjects/trigger/jumppads.qc
@@ -249,23 +249,8 @@ bool jumppad_push(entity this, entity targ, bool is_velocity_pad)
 
 	vector org = targ.origin;
 
-	if(STAT(Q3COMPAT, targ) || this.spawnflags & PUSH_STATIC)
-	{
+	if(Q3COMPAT_COMMON || this.spawnflags & PUSH_STATIC)
 		org = (this.absmin + this.absmax) * 0.5;
-	}
-
-	bool already_pushed = false;
-	if(is_velocity_pad) // remember velocity jump pads
-	{
-		if(this == targ.last_pushed || (targ.last_pushed && !STAT(Q3COMPAT, targ))) // if q3compat is active overwrite last stored jump pad, otherwise ignore
-		{
-			already_pushed = true;
-		}
-		else
-		{
-			targ.last_pushed = this; // may be briefly out of sync between client and server if client prediction is toggled
-		}
-	}
 
 	bool already_pushed = false;
 	if(is_velocity_pad) // remember velocity jump pads