From b2c76d9ff025b097ed97a3df9f2cdf25d35a9124 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Sun, 8 Jun 2025 04:58:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=97=B6=E6=96=B9=E5=9D=97=E7=A0=B4?= =?UTF-8?q?=E5=9D=8F=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bukkit/plugin/injector/WorldStorageInjector.java | 6 +++++- common-files/src/main/resources/config.yml | 2 +- .../craftengine/core/block/BlockRegistryMirror.java | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/WorldStorageInjector.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/WorldStorageInjector.java index 0a64c0b67..285d026c8 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/WorldStorageInjector.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/WorldStorageInjector.java @@ -17,6 +17,7 @@ import net.momirealms.craftengine.bukkit.nms.FastNMS; import net.momirealms.craftengine.bukkit.plugin.reflection.minecraft.CoreReflections; import net.momirealms.craftengine.bukkit.util.BlockStateUtils; import net.momirealms.craftengine.bukkit.util.LocationUtils; +import net.momirealms.craftengine.core.block.BlockStateWrapper; import net.momirealms.craftengine.core.block.EmptyBlock; import net.momirealms.craftengine.core.block.ImmutableBlockState; import net.momirealms.craftengine.core.plugin.CraftEngine; @@ -227,7 +228,10 @@ public class WorldStorageInjector { holder.ceChunk().setDirty(true); if (Config.enableLightSystem()) { // 自定义块到原版块，只需要判断旧块是否和客户端一直 - updateLight(holder, previous.vanillaBlockState().handle(), previousState, x, y, z); + BlockStateWrapper wrapper = previous.vanillaBlockState(); + if (wrapper != null) { + updateLight(holder, wrapper.handle(), previousState, x, y, z); + } } } } else { diff --git a/common-files/src/main/resources/config.yml b/common-files/src/main/resources/config.yml index cb1b7dda7..0291b026e 100644 --- a/common-files/src/main/resources/config.yml +++ b/common-files/src/main/resources/config.yml @@ -336,7 +336,7 @@ gui: performance: # Maximum chain update depth when fixing client visuals - max-note-block-chain-update-limit: 32 + max-note-block-chain-update-limit: 48 # Prevent lag or oversized packet when processing emoji-heavy content max-emojis-per-parse: 16 diff --git a/core/src/main/java/net/momirealms/craftengine/core/block/BlockRegistryMirror.java b/core/src/main/java/net/momirealms/craftengine/core/block/BlockRegistryMirror.java index 72cb6de1c..1b273d9e2 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/block/BlockRegistryMirror.java +++ b/core/src/main/java/net/momirealms/craftengine/core/block/BlockRegistryMirror.java @@ -17,4 +17,8 @@ public class BlockRegistryMirror { public static int size() { return customBlockStates.length; } + + public static BlockStateWrapper stoneState() { + return stoneState; + } }