Rewrite trigger_swamp to not require spawning new entities per player, implementation...

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

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index b4947635f320e37ce78603d07255b11fb7c57b25..79dca007633967ec8499d0a7b3c7e50054f15bf8 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -687,8 +687,9 @@ void PutPlayerInServer(entity this)
                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;
+               IL_REMOVE(g_swamped, this);
+       this.swampslug = NULL;
+       this.swamp_interval = 0;
        STAT(HUD, this) = HUD_NORMAL;
 
        this.event_damage = PlayerDamage;