Merge branch 'master' into Mario/classname_checks

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_triggers.qc

diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc
index 7defd351cdffe61e50f39931779e5bc8393bc0a4..65846f5e38ba332e8f6e226c8f29831f18474260 100644 (file)
--- a/qcsrc/server/g_triggers.qc
+++ b/qcsrc/server/g_triggers.qc
@@ -476,17 +476,6 @@ void trigger_hurt_touch()
                        Damage(other, self, self, self.dmg, DEATH_HURTTRIGGER, other.origin, '0 0 0');
                }
        }
-       else
-       {
-               if (!other.owner)
-               {
-                       if (other.classname == "rune")                  // reset runes
-                       {
-                               EXACTTRIGGER_TOUCH;
-                               other.nextthink = min(other.nextthink, time + 1);
-                       }
-               }
-       }
 
        return;
 }