From f7ab813841d65b6989556c419d4cca4887cba7ba Mon Sep 17 00:00:00 2001 From: StarWishsama Date: Tue, 7 Jan 2025 20:36:59 +0800 Subject: [PATCH] fix: check version when handle wind charge --- .../storage/controller/SlimefunBlockData.java | 13 ++----------- .../listeners/ExplosionsListener.java | 4 +++- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/SlimefunBlockData.java b/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/SlimefunBlockData.java index 417f669903..29138215a1 100644 --- a/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/SlimefunBlockData.java +++ b/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/SlimefunBlockData.java @@ -6,10 +6,12 @@ import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.ParametersAreNullableByDefault; +import lombok.ToString; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; import org.bukkit.Location; import org.bukkit.inventory.ItemStack; +@ToString public class SlimefunBlockData extends ASlimefunDataContainer { private final Location location; private volatile BlockMenu menu; @@ -75,15 +77,4 @@ void setBlockMenu(BlockMenu blockMenu) { return re; } - - @Override - public String toString() { - return "SlimefunBlockData [sfId=" - + getSfId() - + ", location=" - + location - + ", isPendingRemove=" - + isPendingRemove() - + "]"; - } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ExplosionsListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ExplosionsListener.java index efdcbd898e..9730434556 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ExplosionsListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ExplosionsListener.java @@ -3,6 +3,7 @@ import com.xzavier0722.mc.plugin.slimefun4.storage.callback.IAsyncReadCallback; import com.xzavier0722.mc.plugin.slimefun4.storage.controller.SlimefunBlockData; import com.xzavier0722.mc.plugin.slimefun4.storage.util.StorageCacheUtils; +import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; import io.github.thebusybiscuit.slimefun4.core.attributes.WitherProof; import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; @@ -45,7 +46,8 @@ public void onEntityExplode(EntityExplodeEvent e) { * Wind charge **doesn't** break block but spigot still give us break list, * so we just ignore it. */ - if (e.getEntityType() == EntityType.WIND_CHARGE) { + if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_21) + && e.getEntityType() == EntityType.WIND_CHARGE) { return; }