Merge branch 'Mario/buff_timer' into 'master'

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

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 7e2f0cf02ab878525ac6e50dae2b285cb90febd9..3a99e31ded5d44003bdeba1f36df6bf52083a39a 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -40,6 +40,7 @@
 #include "../common/mapobjects/teleporters.qh"
 #include "../common/mapobjects/target/spawnpoint.qh"
 #include <common/mapobjects/trigger/counter.qh>
 #include "../common/mapobjects/teleporters.qh"
 #include "../common/mapobjects/target/spawnpoint.qh"
 #include <common/mapobjects/trigger/counter.qh>

+#include <common/mapobjects/trigger/swamp.qh>

 
 #include "../common/vehicles/all.qh"
 
 
 #include "../common/vehicles/all.qh"
 


@@ -682,6 +683,9 @@ void PutPlayerInServer(entity this)
        if(this.conveyor)
                IL_REMOVE(g_conveyed, this);
        this.conveyor = NULL; // prevent conveyors at the previous location from moving a freshly spawned player
        if(this.conveyor)
                IL_REMOVE(g_conveyed, this);
        this.conveyor = NULL; // prevent conveyors at the previous location from moving a freshly spawned player

+       if(this.swampslug)
+               delete(this.swampslug);
+       this.in_swamp = false;

        STAT(HUD, this) = HUD_NORMAL;
 
        this.event_damage = PlayerDamage;
        STAT(HUD, this) = HUD_NORMAL;
 
        this.event_damage = PlayerDamage;