Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

diff --combined qcsrc/server/w_common.qc
index 14875ff2717d1535738647174f08688c605d7abc,4b465bd77aac8b6822925c202b0f00b541163b70..1a995191c2f81025e9c9235d145649f0b9f82c42
--- 1/qcsrc/server/w_common.qc
--- 2/qcsrc/server/w_common.qc
+++ b/qcsrc/server/w_common.qc
@@@ -353,6 -353,8 +353,8 @@@ void fireBallisticBullet_trace_callback
  {
        if(vlen(trace_endpos - fireBallisticBullet_trace_callback_ent.origin) > 16)
                zcurveparticles_from_tracetoss(fireBallisticBullet_trace_callback_eff, fireBallisticBullet_trace_callback_ent.origin, trace_endpos, fireBallisticBullet_trace_callback_ent.velocity);
+       WarpZone_trace_forent = world;
+       self.owner = world;
  }
  
  void fireBallisticBullet(vector start, vector dir, float spread, float pSpeed, float lifetime, float damage, float headshotbonus, float force, float dtype, float tracereffects, float gravityfactor, float bulletconstant)
@@@ -416,8 -418,7 +418,8 @@@
  
                if(lag)
                        FOR_EACH_PLAYER(pl)
 -                              antilag_takeback(pl, time - lag);
 +                              if(pl != self)
 +                                      antilag_takeback(pl, time - lag);
  
                oldself = self;
                self = proj;
@@@ -439,15 -440,6 +441,6 @@@
                        trace_fraction = 0;
                        fireBallisticBullet_trace_callback_ent = self;
                        fireBallisticBullet_trace_callback_eff = eff;
-                       // FIXME can we somehow do this with just ONE trace?
-                       WarpZone_TraceToss(self, self.owner);
-                       if(self.owner && WarpZone_trace_firstzone)
-                       {
-                               self.owner = world;
-                               self.velocity = v0;
-                               self.gravity = g0;
-                               continue;
-                       }
                        WarpZone_TraceToss_ThroughZone(self, self.owner, world, fireBallisticBullet_trace_callback);
                        self.velocity = v0;
                        self.gravity = g0;
@@@ -504,8 -496,7 +497,8 @@@
  
                if(lag)
                        FOR_EACH_PLAYER(pl)
 -                              antilag_restore(pl);
 +                              if(pl != self)
 +                                      antilag_restore(pl);
  
                remove(proj);