diff --git a/ReallifeGamemode.Client/Player/weaponlist.ts b/ReallifeGamemode.Client/Player/weaponlist.ts
index 09c0eb75..d9dbd111 100644
--- a/ReallifeGamemode.Client/Player/weaponlist.ts
+++ b/ReallifeGamemode.Client/Player/weaponlist.ts
@@ -34,39 +34,6 @@ export default function weaponList(globalData: IGlobalData) {
     var specialWep = "";
     var timer = "";
 
-    mp.events.add('WeaponModifier', (player, modifier) => {
-        mp.gui.chat.push("Modifier steht jetzt auf" + modifier);
-        //mp.players.local.setWeaponDamageModifier(modifier);
-        mp.game.invoke("0xCE07B9F7817AADA3", player, 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", player, modifier);
-    });
-    /*mp.events.add('playerWeaponShot', (targetPosition, targetEntity) => {
-    for (var x in this.weaponAmmo) {
-        if (this.weaponAmmo[x].id != this.currentWeapon) {
-            continue;
-        }
-        this.weaponAmmo[x].ammo = this.weaponAmmo[x].ammo - 1;
-    }
-    let weaponDamage = 1;
-    switch (this.currentWeapon) {
-        case 0xBFEFFF6D:
-            weaponDamage = 30;
-            break;
-        case 0x7F229F94:
-            weaponDamage = 100;
-            break;
-        default:
-            weaponDamage = 1;
-            break;
-    }
-    mp.players.local.setWeaponDamageModifier(weaponDamage);
-    });*/
-
     //Weapon Menu
 
     mp.events.add('showWeaponMenu', (primariesArr, secondariesArr, meleesArr, specialsArr, jsonTime) => {
diff --git a/ReallifeGamemode.Client/util/WeaponDamage.ts b/ReallifeGamemode.Client/util/WeaponDamage.ts
new file mode 100644
index 00000000..dee90bea
--- /dev/null
+++ b/ReallifeGamemode.Client/util/WeaponDamage.ts
@@ -0,0 +1,75 @@
+export default function weapondamageUtil() {
+    mp.events.add('SERVER:WeaponModifier', (player) => {
+        //mp.gui.chat.push("Modifier steht jetzt auf" + modifier);
+        //mp.players.local.setWeaponDamageModifier(modifier);
+        let modifier = 1;
+        let meelemodifier = 1;
+        switch (this.currentWeapon) {
+            case 0x1B06D571: //Pistol
+                modifier = 0.4;
+                meelemodifier = 1;
+                break;
+            case 0xBFE256D4: //Pistol_MK2
+                modifier = 0.4;
+                meelemodifier = 1;
+                break;
+            case 0x5EF9FEC4: //Combatpistol
+                modifier = 0.5;
+                meelemodifier = 1;
+                break;
+            case 0x99AEEB3B: //Pistol50
+                modifier = 0.35;
+                meelemodifier = 1;
+                break;
+            case 0x2BE6766B: //SMG
+                modifier = 0.25;
+                meelemodifier = 1;
+                break;
+            case 0x1D073A89: //Pumpshotgun
+                modifier = 0.2;
+                meelemodifier = 1;
+                break;
+            case 0x83BF0278: //Cabinerifle
+                modifier = 0.25;
+                meelemodifier = 1;
+                break;
+            case 0x624FE830: //Compactrifle
+                modifier = 0.2;
+                meelemodifier = 1;
+                break;
+            case 0xA2719263: //Meele Umarmed Fist
+                meelemodifier = 0.1;
+                modifier = 1;
+                break;
+            case 0x958A4A8F: //Meele Baseball Bat
+                meelemodifier = 0.15;
+                modifier = 1;
+                break;
+            case 0x8BB05FD7: //Meele Flashlight
+                meelemodifier = 0.1;
+                modifier = 1;
+                break;
+            case 0xD8DF3C3C: //Meele Knuckle
+                meelemodifier = 0.1;
+                modifier = 1;
+                break;
+            case 0x678B81B1: //Meele Nightstick
+                meelemodifier = 0.1;
+                modifier = 1;
+                break;
+            default:
+                modifier = 1;
+                meelemodifier = 1;
+                break;
+        }
+        mp.game.invoke("0xCE07B9F7817AADA3", player, modifier);
+        mp.game.invoke("0x4A3DC7ECCC321032", player, meelemodifier);
+    });
+    /*mp.events.add('playerWeaponShot', (targetPosition, targetEntity) => {
+for (var x in this.weaponAmmo) {
+    if (this.weaponAmmo[x].id != this.currentWeapon) {
+        continue;
+    }
+    this.weaponAmmo[x].ammo = this.weaponAmmo[x].ammo - 1;
+}*/
+}
\ No newline at end of file
diff --git a/ReallifeGamemode.Server/Util/WeaponDamage.cs b/ReallifeGamemode.Server/Util/WeaponDamage.cs
new file mode 100644
index 00000000..7f6f2145
--- /dev/null
+++ b/ReallifeGamemode.Server/Util/WeaponDamage.cs
@@ -0,0 +1,13 @@
+using GTANetworkAPI;
+
+namespace ReallifeGamemode.Server.Util
+{
+  class WeaponDamage : Script
+  {
+    [ServerEvent(Event.PlayerWeaponSwitch)]
+    public void OnPlayerWeaponSwitch(Player player, WeaponHash oldWeapon, WeaponHash newWeapon)
+    {
+      NAPI.ClientEvent.TriggerClientEvent(player, "SERVER:WeaponModifier", player);
+    }
+  }
+}