From 61f091308c137b49dcbb375acff5d4ae81711b0f Mon Sep 17 00:00:00 2001 From: NavidK0 Date: Mon, 14 Mar 2016 05:26:22 -0400 Subject: [PATCH] Prevent sound listener from being registered, should prevent sounds from borking anything else until we can get it fixed --- .../disguise/utilities/DisguiseSound.java | 11 +++++------ .../disguise/utilities/PacketsManager.java | 17 +++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/me/libraryaddict/disguise/utilities/DisguiseSound.java b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseSound.java index 8fe016e1..82a3a561 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/DisguiseSound.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseSound.java @@ -79,12 +79,11 @@ public enum DisguiseSound { public static DisguiseSound getType(String name) { //TODO: FIX the disguise sounds - return null; -// try { -// return valueOf(name); -// } catch (Exception ex) { -// return null; -// } + try { + return valueOf(name); + } catch (Exception ex) { + return null; + } } private HashSet cancelSounds = new HashSet<>(); diff --git a/src/main/java/me/libraryaddict/disguise/utilities/PacketsManager.java b/src/main/java/me/libraryaddict/disguise/utilities/PacketsManager.java index 55ee7acc..d7200ec2 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/PacketsManager.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/PacketsManager.java @@ -1099,14 +1099,15 @@ public class PacketsManager { } public static void setHearDisguisesListener(boolean enabled) { - if (soundsListenerEnabled != enabled) { - soundsListenerEnabled = enabled; - if (soundsListenerEnabled) { - ProtocolLibrary.getProtocolManager().addPacketListener(soundsListener); - } else { - ProtocolLibrary.getProtocolManager().removePacketListener(soundsListener); - } - } + //TODO: FIX SOUNDS +// if (soundsListenerEnabled != enabled) { +// soundsListenerEnabled = enabled; +// if (soundsListenerEnabled) { +// ProtocolLibrary.getProtocolManager().addPacketListener(soundsListener); +// } else { +// ProtocolLibrary.getProtocolManager().removePacketListener(soundsListener); +// } +// } } public static void setInventoryListenerEnabled(boolean enabled) {