fix #3 fix #4

J3fftw1 · Feb 7, 2020 · ae10df0 · ae10df0
1 parent e83538c
commit ae10df0
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/src/main/java/dev/j3fftw/soundmuffler/SoundMufflerListener.java b/src/main/java/dev/j3fftw/soundmuffler/SoundMufflerListener.java
@@ -10,6 +10,7 @@
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.Plugin;
 
@@ -26,10 +27,22 @@ public void onPacketSending(PacketEvent event) {
         if (event.getPacketType() == PacketType.Play.Server.NAMED_SOUND_EFFECT
             || event.getPacketType() == PacketType.Play.Server.ENTITY_SOUND
         ) {
-            int x = event.getPacket().getIntegers().read(0) >> 3;
-            int y = event.getPacket().getIntegers().read(1) >> 3;
-            int z = event.getPacket().getIntegers().read(2) >> 3;
-            Location loc = new Location(event.getPlayer().getWorld(), x, y, z);
+            Location loc;
+            if (event.getPacketType() == PacketType.Play.Server.NAMED_SOUND_EFFECT){
+                int x = event.getPacket().getIntegers().read(0) >> 3;
+                int y = event.getPacket().getIntegers().read(1) >> 3;
+                int z = event.getPacket().getIntegers().read(2) >> 3;
+                loc = new Location(event.getPlayer().getWorld(), x, y, z);
+            } else if (event.getPacketType() == PacketType.Play.Server.ENTITY_SOUND) {
+                loc = event.getPlayer().getWorld().getEntities().stream()
+                    .filter(e -> e.getEntityId() == event.getPacket().getIntegers().read(0))
+                    .map(Entity::getLocation)
+                    .findAny().orElse(null);
+            } else return;
+
+            if (loc == null)
+                return;
+
             final Block soundMuff = findSoundMuffler(loc);
             if (soundMuff != null
                 && BlockStorage.getLocationInfo(soundMuff.getLocation(), "enabled") != null