Index: src/server/combatmanager.cpp===================================================================--- src/server/combatmanager.cpp (revision 885)+++ src/server/combatmanager.cpp (working copy)@@ -707,7 +707,10 @@ } case ATTACK_OUTOFAMMO: {- psserver->SendSystemError(event->AttackerCID, "You ran out of ammo!");+ psserver->SendSystemError(event->AttackerCID, "You are out of ammo!");++ if (event->attacker && event->attacker.IsValid())+ StopAttack(dynamic_cast<gemActor*>((gemObject *) event->attacker)); // if you run out of ammo, you exit attack mode } }