From f0dba9bfadf7ad3a7f54d68c5b01cc66025b2d3d Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Tue, 12 Dec 2023 13:09:17 +0800 Subject: [PATCH] Look, A Baka... FIX CCE --- patches/server/0122-CCE-update-suppression.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/server/0122-CCE-update-suppression.patch b/patches/server/0122-CCE-update-suppression.patch index c6eaac57..3e149527 100644 --- a/patches/server/0122-CCE-update-suppression.patch +++ b/patches/server/0122-CCE-update-suppression.patch @@ -5,7 +5,7 @@ Subject: [PATCH] CCE update suppression diff --git a/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java -index dd40b975b72f7bd16f2c491a36c39b7098c66f2b..b312d46de96ac63d6ff4b7e82eae01d5cb92a843 100644 +index dd40b975b72f7bd16f2c491a36c39b7098c66f2b..bb9ac66ab47cb37f545d319630ff28e600c8a038 100644 --- a/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java +++ b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java @@ -265,17 +265,21 @@ public class ShulkerBoxBlock extends BaseEntityBlock { @@ -18,7 +18,7 @@ index dd40b975b72f7bd16f2c491a36c39b7098c66f2b..b312d46de96ac63d6ff4b7e82eae01d5 try { - return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(world.getBlockEntity(pos)); + return top.leavesmc.leaves.LeavesConfig.cceUpdateSuppression ? -+ AbstractContainerMenu.getRedstoneSignalFromContainer((net.minecraft.world.Container) world) : ++ AbstractContainerMenu.getRedstoneSignalFromContainer((net.minecraft.world.Container) world.getBlockEntity(pos)) : + AbstractContainerMenu.getRedstoneSignalFromBlockEntity(world.getBlockEntity(pos)); } catch (ClassCastException ex) { throw new top.leavesmc.leaves.util.UpdateSuppressionException(null, pos); @@ -26,7 +26,7 @@ index dd40b975b72f7bd16f2c491a36c39b7098c66f2b..b312d46de96ac63d6ff4b7e82eae01d5 } else { - return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(world.getBlockEntity(pos)); + return top.leavesmc.leaves.LeavesConfig.cceUpdateSuppression ? -+ AbstractContainerMenu.getRedstoneSignalFromContainer((net.minecraft.world.Container) world) : ++ AbstractContainerMenu.getRedstoneSignalFromContainer((net.minecraft.world.Container) world.getBlockEntity(pos)) : + AbstractContainerMenu.getRedstoneSignalFromBlockEntity(world.getBlockEntity(pos)); } - // Leaves end - fix update suppression crash