Merge remote-tracking branch 'origin/nifrek/hagar_own_traileffect_fix'

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

diff --git a/qcsrc/server/w_porto.qc b/qcsrc/server/w_porto.qc
index cb46f528231d275c94bd471c46b4c9b7691a9180..fb8e427cc141c67d64dee696496b431fa72549b1 100644 (file)
--- a/qcsrc/server/w_porto.qc
+++ b/qcsrc/server/w_porto.qc
@@ -53,7 +53,7 @@ void W_Porto_Fail (float failhard)
 
 void W_Porto_Remove (entity p)
 {
-       if(p.porto_current)
+       if(p.porto_current.realowner == p && p.porto_current.classname == "porto")
        {
                entity oldself;
                oldself = self;
@@ -156,7 +156,7 @@ void W_Porto_Touch (void)
 
 void W_Porto_Attack (void)
 {
-       local entity gren;
+       entity gren;
 
        if not(self.items & IT_UNLIMITED_SUPERWEAPONS)
                self.weapons = self.weapons - (self.weapons & WEPBIT_PORTO);
@@ -279,7 +279,7 @@ float w_porto(float req)
                self.porto_current = world;
        }
        return TRUE;
-};
+}
 #endif
 #ifdef CSQC
 float w_porto(float req)