Merge branch 'master' into Mario/wepent_experimental

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

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index efb24f4e0a2efda5530a2bc56e00b73cc8a50c4f..35f0f227e77ee4c18859d3c10ef55c658aa78d21 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -25,6 +25,7 @@
 #include "../common/items/_mod.qh"
 #include "../common/state.qh"
 #include "../common/effects/qc/globalsound.qh"
+#include "../common/wepent.qh"
 #include "../lib/csqcmodel/sv_model.qh"
 #include "../lib/warpzone/anglestransform.qh"
 #include "../lib/warpzone/server.qh"
@@ -1077,8 +1078,6 @@ bool WarpZone_Projectile_Touch_ImpactFilter_Callback(entity this, entity toucher
 {
        if(SUB_OwnerCheck(this, toucher))
                return true;
-       if(toucher.owner == this.owner)
-               return true;
        if(SUB_NoImpactCheck(this, toucher))
        {
                if(this.classname == "nade")