diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs index c88a2ec7..703ccb84 100644 --- a/ReallifeGamemode.Server/Events/Death.cs +++ b/ReallifeGamemode.Server/Events/Death.cs @@ -26,7 +26,7 @@ namespace ReallifeGamemode.Server.Events player.SetData("isDead", true); //TODO: Zum Full Release entfernen - ChatService.SendMessage(player, "Du bist durch " + killer.Name + " gestorben: " + reason.ToString()); + ChatService.SendMessage(player, "Du bist durch " + killer.Name + " gestorben: " + Managers.WeaponManager.GetCauseOfDeathByHash(reason)); int? killerId; float killerPosX; @@ -57,9 +57,9 @@ namespace ReallifeGamemode.Server.Events if (player != killer) { Autowanted.Check_AutoWanted(killer, player); - string message = "~y~[HINWEIS]: " + killer.Name + " hat " + player.Name + " getötet (" + Managers.WeaponManager.GetCauseOfDeathByHash(reason)+ ")"; ChatService.BroadcastAdmin(message, AdminLevel.ADMIN); + ChatService.Broadcast("" + reason.ToString()); } } diff --git a/ReallifeGamemode.Server/Managers/WeaponManager.cs b/ReallifeGamemode.Server/Managers/WeaponManager.cs index 4d2ecb98..672d2890 100644 --- a/ReallifeGamemode.Server/Managers/WeaponManager.cs +++ b/ReallifeGamemode.Server/Managers/WeaponManager.cs @@ -331,7 +331,9 @@ namespace ReallifeGamemode.Server.Managers { 1347266149, "Vehicle Vigilante Missile"}, { 2275421702, "Vehicle Viseris MG"}, { 1150790720, "Vehicle Volatol Dual MG"}, - { 1741783703, "Vehicle Water Cannon"} + { 1741783703, "Vehicle Water Cannon"}, + { 2441047180, "Navy Revolver" }, + { (uint)NAPI.Util.WeaponNameToModel("ceramicpistol"), "Ceramic Pistol"} };