From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 30 Dec 2011 11:15:01 +0000 (+0100)
Subject: do the size extension not for trigger_conveyor, only for func_conveyor
X-Git-Tag: xonotic-v0.6.0~74^2~18
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9dfb5878f7df80f4f459f5fc3098118ae6dccdb8;p=xonotic%2Fxonotic-data.pk3dir.git

do the size extension not for trigger_conveyor, only for func_conveyor
---

diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc
index 32975c146..9c9eb42ba 100644
--- a/qcsrc/server/t_plats.qc
+++ b/qcsrc/server/t_plats.qc
@@ -2070,8 +2070,11 @@ void conveyor_think()
 			if(!e.conveyor.state)
 				if(e.movetype != MOVETYPE_NONE)
 				{
-					vector emin = e.absmin - '1 1 1';
-					vector emax = e.absmax + '1 1 1';
+					if(self.solid == SOLID_BSP)
+					{
+						vector emin = e.absmin - '1 1 1';
+						vector emax = e.absmax + '1 1 1';
+					}
 					if(boxesoverlap(emin, emax, self.absmin, self.absmax)) // quick
 						if(WarpZoneLib_BoxTouchesBrush(emin, emax, self, e)) // accurate
 							e.conveyor = self;