Merge pull request #724 from Waischbrot/patch-1

fix NullPointer when sending custom sounds
kernitus · Mar 9, 2024 · 976d31f · 976d31f
2 parents 3358fce + 11ee79a
commit 976d31f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/main/java/kernitus/plugin/OldCombatMechanics/module/ModuleAttackSounds.java b/src/main/java/kernitus/plugin/OldCombatMechanics/module/ModuleAttackSounds.java
@@ -66,6 +66,12 @@ public void onPacketSending(PacketEvent packetEvent) {
             try {
                 final PacketContainer packetContainer = packetEvent.getPacket();
                 final Sound sound = packetContainer.getSoundEffects().read(0);
+
+                //fix NullpointerException when sending a custom sound 
+                if (sound == null) {
+                    return;
+                }
+
                 final String soundName = sound.toString(); // Works for both string and namespaced key
 
                 if (blockedSounds.contains(soundName)) {