From 27c6c91fcbe061c5028b377b255eb50b6015d9da Mon Sep 17 00:00:00 2001
From: Olivier <75835176+JohnsonMichaels123@users.noreply.github.com>
Date: Mon, 28 Dec 2020 12:35:27 -0800
Subject: [PATCH] Fixed SFX for Unarmed Melee (#453)

Fixed a glitch where the player would make a strange axe sound instead of the actual punch/kick sound.
---
 .../game/content/music/sound/CombatSounds.java     | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/music/sound/CombatSounds.java b/2006Redone Server/src/main/java/com/rebotted/game/content/music/sound/CombatSounds.java
index e9212ab8..0cc29ab5 100644
--- a/2006Redone Server/src/main/java/com/rebotted/game/content/music/sound/CombatSounds.java	
+++ b/2006Redone Server/src/main/java/com/rebotted/game/content/music/sound/CombatSounds.java	
@@ -228,19 +228,13 @@ public class CombatSounds {
 	}
 
 	public static int getWeaponSounds(Player c) {
+		if (c.playerEquipment[c.playerWeapon] <= 0) {
+			return 417;
+			}
 		if (c.playerEquipment[c.playerWeapon] >= 1) {
 			String wep = getItemName(c.playerEquipment[c.playerWeapon])
 					.toLowerCase();
-			if (c.playerEquipment[c.playerWeapon] <= 0) {
-				switch (c.fightMode) {
-				case 0:
-					return 416;
-				case 2:
-					return 417;
-				case 1:
-					return 418;
-				}
-			}
+
 
 			if (c.playerEquipment[c.playerWeapon] == 4718) {// Dharok's
 															// Greataxe