From: Mario <zacjardine@y7mail.com>
Date: Sat, 20 Dec 2014 05:03:39 +0000 (+1100)
Subject: Fix some minor problems
X-Git-Tag: xonotic-v0.8.0~56^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2ef462d7ec0dcac07a7de8326cae26eb7b7d04c2;p=xonotic%2Fxonotic-data.pk3dir.git

Fix some minor problems
---

diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc
index f4fb67a1b..f203fdf4f 100644
--- a/qcsrc/server/g_triggers.qc
+++ b/qcsrc/server/g_triggers.qc
@@ -61,6 +61,7 @@ void SUB_UseTargets()
 //
 // print the message
 //
+	if(self)
 	if(IS_PLAYER(activator) && self.message != "")
 	if(IS_REAL_CLIENT(activator))
 	{
@@ -203,8 +204,8 @@ void multi_use()
 
 void multi_touch()
 {
-	if (!(self.spawnflags & 2))
-		if (!other.iscreature)
+	if(!(self.spawnflags & 2))
+	if(!other.iscreature)
 			return;
 
 	if(self.team)
@@ -384,7 +385,7 @@ void counter_use()
 	{
 		if(IS_PLAYER(activator) && (self.spawnflags & SPAWNFLAG_NOMESSAGE) == 0)
 			Send_Notification(NOTIF_ONE, activator, MSG_CENTER, CENTER_SEQUENCE_COMPLETED);
-			
+
 		self.enemy = activator;
 		multi_trigger ();
 	}
@@ -2051,9 +2052,9 @@ string trigger_magicear_processmessage_forallears(entity source, float teamsay,
 	for(ear = magicears; ear; ear = ear.enemy)
 	{
 		msgout = trigger_magicear_processmessage(ear, source, teamsay, privatesay, msgin);
-		if (!(ear.spawnflags & 64))
-			if(magicear_matched)
-				return msgout;
+		if(!(ear.spawnflags & 64))
+		if(magicear_matched)
+			return msgout;
 		msgin = msgout;
 	}
 	return msgin;
diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc
index 29e57e497..315abe152 100644
--- a/qcsrc/server/t_plats.qc
+++ b/qcsrc/server/t_plats.qc
@@ -1176,7 +1176,7 @@ void door_touch()
 	if (!(self.owner.dmg) && (self.owner.message != ""))
 	{
 		if (IS_CLIENT(other))
-			centerprint(other, self.message);
+			centerprint(other, self.owner.message);
 		play2(other, "misc/talk.wav");
 	}
 }