Commits

pokechu22 authored and md_5 committed 4507d99aeac
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.
No tags

nms-patches/DispenserRegistry.patch

Modified
348 348 + if (idispensebehavior != IDispenseBehavior.NONE && idispensebehavior != this) {
349 349 + idispensebehavior.a(isourceblock, eventStack);
350 350 + return itemstack;
351 351 + }
352 352 + }
353 353 +
354 354 + EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), (EntityLiving) null);
355 355 + // CraftBukkit end
356 356
357 357 world.addEntity(entitytntprimed);
358 -- world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gz, SoundCategory.BLOCKS, 1.0F, 1.0F);
358 + world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gz, SoundCategory.BLOCKS, 1.0F, 1.0F);
359 359 - --itemstack.count;
360 -+ world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gk, SoundCategory.BLOCKS, 1.0F, 1.0F);
361 360 + // --itemstack.count; // CraftBukkit - handled above
362 361 return itemstack;
363 362 }
364 363 });
365 364 @@ -437,12 +677,40 @@
366 365 d3 = 0.0D;
367 366 }
368 367
369 368 - EntityBoat entityboat = new EntityBoat(world, d0, d1 + d3, d2);
370 369 + // EntityBoat entityboat = new EntityBoat(world, d0, d1 + d3, d2);

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut