X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_rocketlauncher.qc;h=c109fc796b68afeb88d1b62d683083bd33062c29;hp=d4056763a84d1e418075a0bd7ffe6a35318eb798;hb=4fc59bbd7e2d4f25ba21952ed50ae754295a7faa;hpb=c6b8947c5875567662ac5c3e156325bcff42aee9

diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index d4056763a8..c109fc796b 100644
--- a/qcsrc/server/w_rocketlauncher.qc
+++ b/qcsrc/server/w_rocketlauncher.qc
@@ -291,9 +291,13 @@ void W_Rocket_Think (void)
 
 void W_Rocket_Touch (void)
 {
+	if(WarpZone_Projectile_Touch())
+	{
+		if(wasfreed(self))
+			W_Rocket_Unregister();
+		return;
+	}
 	W_Rocket_Unregister();
-
-	PROJECTILE_TOUCH;
 	W_Rocket_Explode ();
 }
 
@@ -363,6 +367,7 @@ void W_Rocket_Attack (void)
 	W_AttachToShotorg(flash, '5 0 0');
 
 	// common properties
+	other = missile; MUTATOR_CALLHOOK(EditProjectile);
 }
 
 void spawnfunc_weapon_rocketlauncher (void); // defined in t_items.qc