Use remove() instead. No need to keep the disabled weapon entity as long as it won...

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 5caed8e1176833038d902ab88a12acbb94ce8bc5..918347f5c3dd88164bacbec30f69c36c10227ed5 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -46,7 +46,7 @@ float Item_Customize()
        }\r
        else\r
        {\r
        }\r
        else\r
        {\r

-               if(g_ghost_items && self.respawntime > 0) // if respawntime is -1, this item does not respawn\r
+               if(g_ghost_items)\r

                {\r
                        self.colormod = stov(cvar_string("g_ghost_items_color"));\r
                        self.glowmod = self.colormod;\r
                {\r
                        self.colormod = stov(cvar_string("g_ghost_items_color"));\r
                        self.glowmod = self.colormod;\r


@@ -85,7 +85,7 @@ void Item_Show (entity e, float mode)
 \r
                e.spawnshieldtime = 1;\r
        }\r
 \r
                e.spawnshieldtime = 1;\r
        }\r

-       else if((e.flags & FL_WEAPON) && (g_weapon_stay == 3 && self.respawntime > 0)) // if respawntime is -1, this item does not respawn\r
+       else if((e.flags & FL_WEAPON) && (g_weapon_stay == 3))\r

        {\r
                // make the item translucent green and not touchable\r
                e.model = e.mdl;\r
        {\r
                // make the item translucent green and not touchable\r
                e.model = e.mdl;\r


@@ -97,7 +97,7 @@ void Item_Show (entity e, float mode)
 \r
                e.spawnshieldtime = 0; // field indicates whether picking it up may give you anything other than the weapon\r
        }\r
 \r
                e.spawnshieldtime = 0; // field indicates whether picking it up may give you anything other than the weapon\r
        }\r

-       else if(g_ghost_items && self.respawntime > 0) // if respawntime is -1, this item does not respawn\r
+       else if(g_ghost_items)\r

        {\r
                // make the item translucent green and not touchable\r
                e.model = e.mdl;\r
        {\r
                // make the item translucent green and not touchable\r
                e.model = e.mdl;\r


@@ -210,6 +210,8 @@ void Item_ScheduleRespawn(entity e)
        Item_Show(e, 0);\r
        if(e.respawntime > 0) // if respawntime is -1, this item does not respawn\r
                Item_ScheduleRespawnIn(e, ITEM_RESPAWNTIME(e));\r
        Item_Show(e, 0);\r
        if(e.respawntime > 0) // if respawntime is -1, this item does not respawn\r
                Item_ScheduleRespawnIn(e, ITEM_RESPAWNTIME(e));\r

+       else\r
+               remove(e);\r

 }\r
 \r
 void Item_ScheduleInitialRespawn(entity e)\r
 }\r
 \r
 void Item_ScheduleInitialRespawn(entity e)\r