diff --git a/ReallifeGamemode.Client/Player/weaponlist.ts b/ReallifeGamemode.Client/Player/weaponlist.ts index dcbe1f50..09c0eb75 100644 --- a/ReallifeGamemode.Client/Player/weaponlist.ts +++ b/ReallifeGamemode.Client/Player/weaponlist.ts @@ -34,16 +34,16 @@ export default function weaponList(globalData: IGlobalData) { var specialWep = ""; var timer = ""; - mp.events.add('WeaponModifier', (modifier) => { + mp.events.add('WeaponModifier', (player, modifier) => { mp.gui.chat.push("Modifier steht jetzt auf" + modifier); //mp.players.local.setWeaponDamageModifier(modifier); - mp.game.invoke("0xCE07B9F7817AADA3", mp.players.local, modifier); + mp.game.invoke("0xCE07B9F7817AADA3", player, modifier); }); - mp.events.add('WeaponMeeleModifier', (modifier) => { + mp.events.add('WeaponMeeleModifier', (player, modifier) => { mp.gui.chat.push("MeeleModifier steht jetzt auf" + modifier); //mp.players.local.setMeleeWeaponDamageModifier(modifier); - mp.game.invoke("0x4A3DC7ECCC321032", mp.players.local, modifier); + mp.game.invoke("0x4A3DC7ECCC321032", player, modifier); }); /*mp.events.add('playerWeaponShot', (targetPosition, targetEntity) => { for (var x in this.weaponAmmo) { diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index d0209f3d..fec4cd0a 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -1606,13 +1606,13 @@ namespace ReallifeGamemode.Server.Commands public void CmdWeaponModifier(Player player, float modifier) { player.SendChatMessage("Modifier steht auf" + modifier); - player.TriggerEvent("WeaponModifier", modifier); + player.TriggerEvent("WeaponModifier", player, modifier); } [Command("wepmmod", "~m~Benutzung: ~s~/wepmmod [Variable]")] public void CmdWeaponMeeleModifier(Player player, float modifier) { player.SendChatMessage("MeeleModifier steht auf" + modifier); - player.TriggerEvent("WeaponMeeleModifier", modifier); + player.TriggerEvent("WeaponMeeleModifier", player, modifier); } [Command("gotocp", "~m~Benutzung: ~s~/gotocp")] public void CmdAdminGotocp(Player admin)