diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
new file mode 100644
index 00000000..404b2def
--- /dev/null
+++ b/.gitlab/issue_templates/Bug.md
@@ -0,0 +1,12 @@
+### Bug:
+
+#### Was läuft falsch?
+
+
+#### Gibt es eine Fehlermeldung?
+
+
+#### Wie kann man den Fehler reproduzieren?
+
+
+/label ~Bug
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/util/animationSync.ts b/ReallifeGamemode.Client/util/animationSync.ts
index bc2f608d..2270a15d 100644
--- a/ReallifeGamemode.Client/util/animationSync.ts
+++ b/ReallifeGamemode.Client/util/animationSync.ts
@@ -83,12 +83,10 @@
 
     mp.events.addDataHandler("AnimationData", (entity, string) => {
         entity.clearTasksImmediately();
-
         if (animationBreakTimer) {
             clearInterval(animationBreakTimer);
             animationBreakTimer = null;
         }
-
         if (string == null) {
             blockInput = false;
             return;
diff --git a/ReallifeGamemode.Client/util/weapondamage.ts b/ReallifeGamemode.Client/util/weapondamage.ts
index eae20da7..c60d0c01 100644
--- a/ReallifeGamemode.Client/util/weapondamage.ts
+++ b/ReallifeGamemode.Client/util/weapondamage.ts
@@ -21,86 +21,74 @@
         let modifier = 1;
         let meelemodifier = 1;
 
+        blockInput = (mp.game.weapon.getWeapontypeGroup(player.weapon) != 2685387236);
+
         switch (player.weapon) {
             case 0x1B06D571: //Pistol
                 modifier = 0.4;
                 meelemodifier = 1;
-                blockInput = true;
+                //mp.gui.chat.push("PistolModifier: " + modifier);
                 break;
             case 0xBFE256D4: //Pistol_MK2
                 modifier = 0.4;
                 meelemodifier = 1;
-                blockInput = true;
                 break;
             case 0x5EF9FEC4: //Combatpistol
                 modifier = 0.5;
                 meelemodifier = 1;
-                blockInput = true;
                 break;
             case 0x99AEEB3B: //Pistol50
                 modifier = 0.35;
                 meelemodifier = 1;
-                blockInput = true;
                 break;
             case 0x2BE6766B: //SMG
                 modifier = 0.25;
                 meelemodifier = 1;
-                blockInput = true;
                 break;
             case 0x1D073A89: //Pumpshotgun
                 modifier = 0.2;
                 meelemodifier = 1;
-                blockInput = true;
                 break;
             case 0x83BF0278: //Cabinerifle
                 modifier = 0.2;
                 meelemodifier = 1;
-                blockInput = true;
                 break;
             case 0x624FE830: //Compactrifle
                 modifier = 0.2;
                 meelemodifier = 0.1;
-                blockInput = true;
                 break;
             case 0x05FC3C11: //Sniperrifle
                 modifier = 0.5;
                 meelemodifier = 1;
-                blockInput = true;
                 break;
             case 0xA2719263: //Meele Umarmed Fist
                 meelemodifier = 0.1;
                 modifier = 1;
-                blockInput = false;
                 //mp.gui.chat.push("FistModifier: " + meelemodifier);
                 break;
             case 0x958A4A8F: //Meele Baseball Bat
                 meelemodifier = 0.15;
                 modifier = 1;
-                blockInput = false;
                 break;
             case 0x8BB05FD7: //Meele Flashlight
                 meelemodifier = 0.1;
                 modifier = 1;
-                blockInput = false;
 
                 break;
             case 0xD8DF3C3C: //Meele Knuckle
                 meelemodifier = 0.1;
                 modifier = 1;
-                blockInput = false;
 
                 //mp.gui.chat.push("KnuckleModifier: " + meelemodifier);
                 break;
             case 0x678B81B1: //Meele Nightstick
                 meelemodifier = 0.1;
                 modifier = 1;
-                blockInput = false;
 
                 break;
             default:
                 modifier = 1;
                 meelemodifier = 1;
-                blockInput = false;
 
                 break;
         }