X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_plats.qc;h=6ca7aee30428ba864403a079e62c7154707e0041;hb=a8e4e2497120bb8b8b3600f3b48276148c83285a;hp=a556d6d0bb192dd72d9417d2535a7eafa3e82aac;hpb=5fab88f2b713eb8f20a7296a20f57f6dfafd220d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc
index a556d6d0b..6ca7aee30 100644
--- a/qcsrc/server/t_plats.qc
+++ b/qcsrc/server/t_plats.qc
@@ -57,7 +57,17 @@ void plat_spawn_inside_trigger()
 		tmax_y = tmin_y + 1;
 	}
 
-	setsize (trigger, tmin, tmax);
+	if(tmin_x < tmax_x)
+		if(tmin_y < tmax_y)
+			if(tmin_z < tmax_z)
+			{
+				setsize (trigger, tmin, tmax);
+				return;
+			}
+
+	// otherwise, something is fishy...
+	remove(trigger);
+	objerror("plat_spawn_inside_trigger: platform has odd size or lip, can't spawn");
 }
 
 void plat_hit_top()
@@ -235,10 +245,10 @@ void spawnfunc_func_plat()
 	self.pos2 = self.origin;
 	self.pos2_z = self.origin_z - self.height;
 
-	plat_spawn_inside_trigger ();	// the "start moving" trigger
-
 	self.reset = plat_reset;
 	plat_reset();
+
+	plat_spawn_inside_trigger ();	// the "start moving" trigger
 }