From 34956960b64b8bac1c696459f280e27f2d0d10e6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 17 Jul 2020 10:12:52 -0500 Subject: [PATCH] Fix bergamutes silencing ambient and record sounds, remove them from the set more eagerly --- .../block/subtile/functional/BergamuteEventHandler.java | 2 ++ .../common/block/subtile/functional/SubTileBergamute.java | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java index cf56168fb..de2eea71f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java @@ -58,6 +58,8 @@ public class BergamuteEventHandler { private static boolean shouldSilence(ISound sound) { return sound.getCategory() != SoundCategory.VOICE && sound.getCategory() != SoundCategory.MUSIC + && sound.getCategory() != SoundCategory.RECORDS + && sound.getCategory() != SoundCategory.AMBIENT && sound.getClass().getName().startsWith("net.minecraft.client.audio"); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java index 9bfba5f9c..76cf67bf7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java @@ -35,6 +35,12 @@ public class SubTileBergamute extends TileEntityFunctionalFlower { } } + @Override + public void remove() { + super.remove(); + existingFlowers.remove(this); + } + // todo seems expensive when we have lots of sounds cache maybe? protected static SubTileBergamute getBergamuteNearby(double x, double y, double z) { return existingFlowers.stream()