]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/portals.qc
Transifex autosync
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / portals.qc
index 2c5839175381f6e3edcfd67dbdf1f5c251dbadde..405d179ca8fce7cfd81b3c51f11447e903916cd6 100644 (file)
@@ -1,27 +1,27 @@
 #include "portals.qh"
 
-#include <common/effects/all.qh>
-#include "hook.qh"
-#include "mutators/_mod.qh"
-#include <server/client.qh>
-#include <server/weapons/common.qh>
 #include <common/constants.qh>
 #include <common/deathtypes/all.qh>
-#include <common/notifications/all.qh>
+#include <common/effects/all.qh>
+#include <common/mapobjects/subs.qh>
 #include <common/mapobjects/teleporters.qh>
 #include <common/mapobjects/triggers.qh>
-#include <common/mapobjects/subs.qh>
+#include <common/notifications/all.qh>
 #include <common/util.qh>
+#include <common/vehicles/sv_vehicles.qh>
+#include <common/vehicles/vehicle.qh>
 #include <common/weapons/_all.qh>
+#include <common/weapons/weapon/porto.qh>
 #include <lib/csqcmodel/sv_model.qh>
 #include <lib/warpzone/anglestransform.qh>
-#include <lib/warpzone/util_server.qh>
 #include <lib/warpzone/common.qh>
-#include <common/vehicles/vehicle.qh>
-#include <common/vehicles/sv_vehicles.qh>
-#include <common/weapons/weapon/porto.qh>
-#include <server/player.qh>
+#include <lib/warpzone/util_server.qh>
+#include <server/client.qh>
 #include <server/damage.qh>
+#include <server/hook.qh>
+#include <server/mutators/_mod.qh>
+#include <server/player.qh>
+#include <server/weapons/common.qh>
 
 #define PORTALS_ARE_NOT_SOLID
 
@@ -404,6 +404,7 @@ void Portal_Connect(entity teleporter, entity destination)
 #else
        teleporter.solid = SOLID_BSP;
 #endif
+       setorigin(teleporter, teleporter.origin); // link it to the area grid
 }
 
 void Portal_Remove(entity portal, float killed)