Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2026-01-04 15:41:31 +00:00
Code Issues Releases Activity

feat: sound update suppression(#513)

Browse Source
This commit is contained in:
MC_XiaoHei
2025-05-20 12:09:37 +00:00
parent 798b6780b5
commit dbf111f5fb
2 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
leaves-server/minecraft-patches/features/0130-Sound-update-suppression.patch Normal file
View File

@@ -0,0 +1,55 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MC_XiaoHei <xiaohei.xor7@outlook.com>
Date: Tue, 20 May 2025 12:08:40 +0000
Subject: [PATCH] Sound update suppression
diff --git a/net/minecraft/world/level/block/SculkSensorBlock.java b/net/minecraft/world/level/block/SculkSensorBlock.java
index 7279debafadafc32253ce141c45e89e750cdc044..d912c5b119bd03203fa06683ac2d6d9ca514cfeb 100644
--- a/net/minecraft/world/level/block/SculkSensorBlock.java
+++ b/net/minecraft/world/level/block/SculkSensorBlock.java
@@ -97,7 +97,7 @@ public class SculkSensorBlock extends BaseEntityBlock implements SimpleWaterlogg
@Override
public void stepOn(Level level, BlockPos pos, BlockState state, Entity entity) {
if (!level.isClientSide()
- && canActivate(state)
+ && canActivate(state, pos) // Leaves - Sound update suppression
&& entity.getType() != EntityType.WARDEN
&& level.getBlockEntity(pos) instanceof SculkSensorBlockEntity sculkSensorBlockEntity
&& level instanceof ServerLevel serverLevel
@@ -202,7 +202,12 @@ public class SculkSensorBlock extends BaseEntityBlock implements SimpleWaterlogg
public static SculkSensorPhase getPhase(BlockState state) {
return state.getValue(PHASE);
}
-
+ // Leaves start - Sound update suppression
+ public static boolean canActivate(BlockState state, BlockPos pos) {
+ if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.updater.soundUpdateSuppression && !(state.getBlock() instanceof SculkSensorBlock)) throw new org.leavesmc.leaves.util.UpdateSuppressionException(pos, state.getBlock());
+ return canActivate(state);
+ }
+ // Leaves end - Sound update suppression
public static boolean canActivate(BlockState state) {
return state.getBlock() instanceof SculkSensorBlock && getPhase(state) == SculkSensorPhase.INACTIVE; // Paper - Check for a valid type
}
diff --git a/net/minecraft/world/level/block/entity/SculkSensorBlockEntity.java b/net/minecraft/world/level/block/entity/SculkSensorBlockEntity.java
index 26d2205fe7c1322f52e7d162e1be9dc23349f3b6..a6c19d8215d5a803bacb84a4ed9b6b6c69b42cd1 100644
--- a/net/minecraft/world/level/block/entity/SculkSensorBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/SculkSensorBlockEntity.java
@@ -118,7 +118,7 @@ public class SculkSensorBlockEntity extends BlockEntity implements GameEventList
public boolean canReceiveVibration(ServerLevel level, BlockPos pos, Holder<GameEvent> gameEvent, @Nullable GameEvent.Context context) {
return (!pos.equals(this.blockPos) || !gameEvent.is(GameEvent.BLOCK_DESTROY) && !gameEvent.is(GameEvent.BLOCK_PLACE))
&& VibrationSystem.getGameEventFrequency(gameEvent) != 0
- && SculkSensorBlock.canActivate(SculkSensorBlockEntity.this.getBlockState());
+ && SculkSensorBlock.canActivate(SculkSensorBlockEntity.this.getBlockState(), pos); // Leaves - Sound update suppression
}
@Override
@@ -126,7 +126,7 @@ public class SculkSensorBlockEntity extends BlockEntity implements GameEventList
ServerLevel level, BlockPos pos, Holder<GameEvent> gameEvent, @Nullable Entity entity, @Nullable Entity playerEntity, float distance
) {
BlockState blockState = SculkSensorBlockEntity.this.getBlockState();
- if (SculkSensorBlock.canActivate(blockState)) {
+ if (SculkSensorBlock.canActivate(blockState, pos)) { // Leaves - Sound update suppression
int gameEventFrequency = VibrationSystem.getGameEventFrequency(gameEvent);
SculkSensorBlockEntity.this.setLastVibrationFrequency(gameEventFrequency);
int redstoneStrengthForDistance = VibrationSystem.getRedstoneStrengthForDistance(distance, this.getListenerRadius());

3
leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java
View File

@@ -217,6 +217,9 @@ public final class LeavesConfig {
@GlobalConfig("cce-update-suppression")
public boolean cceUpdateSuppression = false;
@GlobalConfig("sound-update-suppression")
public boolean soundUpdateSuppression = false;
@RemovedConfig(name = "redstone-wire-dont-connect-if-on-trapdoor", category = "modify", transform = true)
@RemovedConfig(name = "redstone-wire-dont-connect-if-on-trapdoor", category = {"modify", "minecraft-old"}, transform = true)
@GlobalConfig("redstone-wire-dont-connect-if-on-trapdoor")