From: Freddy <schro.sb@gmail.com>
Date: Fri, 6 Apr 2018 21:59:12 +0000 (+0200)
Subject: Explicitly check for ACTIVE_ACTIVE
X-Git-Tag: xonotic-v0.8.5~2176^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=375c41912c7afebd2f25e37920efef219489761f;p=xonotic%2Fxonotic-data.pk3dir.git

Explicitly check for ACTIVE_ACTIVE
---

diff --git a/qcsrc/common/triggers/func/conveyor.qc b/qcsrc/common/triggers/func/conveyor.qc
index f1b0ad52c..4214a7323 100644
--- a/qcsrc/common/triggers/func/conveyor.qc
+++ b/qcsrc/common/triggers/func/conveyor.qc
@@ -17,7 +17,7 @@ void conveyor_think(entity this)
 		IL_REMOVE(g_conveyed, it);
 	});
 
-	if(this.active)
+	if(this.active == ACTIVE_ACTIVE)
 	{
 		FOREACH_ENTITY_RADIUS((this.absmin + this.absmax) * 0.5, vlen(this.absmax - this.absmin) * 0.5 + 1, !it.conveyor.active && isPushable(it),
 		{