summaryrefslogtreecommitdiffstats
path: root/nms-patches/DispenserRegistry.patch
diff options
context:
space:
mode:
authorPokechu22 <Pokechu022@gmail.com>2016-08-20 09:48:07 +1000
committermd_5 <git@md-5.net>2016-08-20 09:48:07 +1000
commit4507d99aeac5af1d6076e0739505f8525633f8f6 (patch)
tree9e041a8e6bff57c04a0fd60ad07582abb331d71b /nms-patches/DispenserRegistry.patch
parent5e5cf84f2cca025d123ab6ddca9e361cf44bfc61 (diff)
downloadcraftbukkit-4507d99aeac5af1d6076e0739505f8525633f8f6.tar
craftbukkit-4507d99aeac5af1d6076e0739505f8525633f8f6.tar.gz
craftbukkit-4507d99aeac5af1d6076e0739505f8525633f8f6.tar.lz
craftbukkit-4507d99aeac5af1d6076e0739505f8525633f8f6.tar.xz
craftbukkit-4507d99aeac5af1d6076e0739505f8525633f8f6.zip
SPIGOT-2616: Fix dispensers dispensing TNT making squid sounds
This was caused by the wrong obfuscated sound effect being used, probably due to a merge issue.
Diffstat (limited to 'nms-patches/DispenserRegistry.patch')
-rw-r--r--nms-patches/DispenserRegistry.patch3
1 files changed, 1 insertions, 2 deletions
diff --git a/nms-patches/DispenserRegistry.patch b/nms-patches/DispenserRegistry.patch
index 9246d281..3fde6543 100644
--- a/nms-patches/DispenserRegistry.patch
+++ b/nms-patches/DispenserRegistry.patch
@@ -355,9 +355,8 @@
+ // CraftBukkit end
world.addEntity(entitytntprimed);
-- world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gz, SoundCategory.BLOCKS, 1.0F, 1.0F);
+ world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gz, SoundCategory.BLOCKS, 1.0F, 1.0F);
- --itemstack.count;
-+ world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gk, SoundCategory.BLOCKS, 1.0F, 1.0F);
+ // --itemstack.count; // CraftBukkit - handled above
return itemstack;
}