about summary refs log tree commit diff
path: root/src/game/server/entities/pickup.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/server/entities/pickup.cpp')
-rw-r--r--src/game/server/entities/pickup.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/server/entities/pickup.cpp b/src/game/server/entities/pickup.cpp
index e9997733..b6258446 100644
--- a/src/game/server/entities/pickup.cpp
+++ b/src/game/server/entities/pickup.cpp
@@ -25,6 +25,8 @@ void PICKUP::reset()
 		spawntick = server_tick() + server_tickspeed() * data->pickups[type].spawndelay;
 	else
 		spawntick = -1;
+		
+	spawntick = -1;
 }
 
 void PICKUP::tick()
@@ -93,6 +95,7 @@ void PICKUP::tick()
 				// activate ninja on target player
 				chr->ninja.activationtick = server_tick();
 				chr->weapons[WEAPON_NINJA].got = true;
+				chr->weapons[WEAPON_NINJA].ammo = -1;
 				chr->last_weapon = chr->active_weapon;
 				chr->active_weapon = WEAPON_NINJA;
 				respawntime = data->pickups[type].respawntime;