X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_triggers.qc;h=6c0921ba9b6ee7317f341dd2e09a623786a3c4d7;hb=a312dcbb239fa30b63550a4fd294c494223a2d42;hp=0a70de75f802fb13561c7ccf6eb259788b901023;hpb=57c5dfd12fc3f7ce7b2bc844325a2c85929f10de;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc
index 0a70de75f..6c0921ba9 100644
--- a/qcsrc/server/g_triggers.qc
+++ b/qcsrc/server/g_triggers.qc
@@ -411,6 +411,14 @@ void spawnfunc_trigger_counter()
 	self.reset = counter_reset;
 };
 
+void trigger_hurt_use()
+{
+	if(activator.classname == "player")
+		self.enemy = activator;
+	else
+		self.enemy = world; // let's just destroy it, if taking over is too much work
+}
+
 .float triggerhurttime;
 void trigger_hurt_touch()
 {
@@ -429,7 +437,16 @@ void trigger_hurt_touch()
 		{
 			EXACTTRIGGER_TOUCH;
 			other.triggerhurttime = time + 1;
-			Damage (other, self, self, self.dmg, DEATH_HURTTRIGGER, other.origin, '0 0 0');
+
+			entity own;
+			own = self.enemy;
+			if(own.classname != "player")
+			{
+				own = self;
+				self.enemy = world; // I still hate you all
+			}
+
+			Damage (other, self, own, self.dmg, DEATH_HURTTRIGGER, other.origin, '0 0 0');
 		}
 	}
 	else
@@ -465,6 +482,8 @@ void spawnfunc_trigger_hurt()
 	EXACTTRIGGER_INIT;
 	self.active = ACTIVE_ACTIVE;
 	self.touch = trigger_hurt_touch;
+	self.use = trigger_hurt_use;
+	self.enemy = world; // I hate you all
 	if (!self.dmg)
 		self.dmg = 1000;
 	if (!self.message)
@@ -1703,6 +1722,7 @@ void follow_init()
 			attach_sameorigin(dst, src, self.message);
 		}
 
+		dst.solid = SOLID_NOT; // solid doesn't work with attachment
 		remove(self);
 	}
 	else