From aa3e2a53eef330f4b2b9e9d61a930d1cc19e479c Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Mon, 1 Aug 2022 18:33:01 +0800 Subject: [PATCH] Backport misapplied patches --- .../mixin/core/world/ExplosionMixin.java | 1 - .../ArclightEventDispatcherRegistry.java | 1 - .../mod/server/event/ChunkEventHandler.java | 36 ------------------- 3 files changed, 38 deletions(-) delete mode 100644 arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ChunkEventHandler.java diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ExplosionMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ExplosionMixin.java index 752c0718..43b358cd 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ExplosionMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ExplosionMixin.java @@ -273,7 +273,6 @@ public abstract class ExplosionMixin implements ExplosionBridge { } blockstate.onBlockExploded(this.level, blockpos, (Explosion) (Object) this); - block.wasExploded(this.level, blockpos, (Explosion) (Object) this); this.level.getProfiler().pop(); } } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ArclightEventDispatcherRegistry.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ArclightEventDispatcherRegistry.java index 3f8dd6af..98ab5165 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ArclightEventDispatcherRegistry.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ArclightEventDispatcherRegistry.java @@ -13,7 +13,6 @@ public abstract class ArclightEventDispatcherRegistry { MinecraftForge.EVENT_BUS.register(new EntityTeleportEventDispatcher()); MinecraftForge.EVENT_BUS.register(new ItemEntityEventDispatcher()); MinecraftForge.EVENT_BUS.register(new WorldEventDispatcher()); - MinecraftForge.EVENT_BUS.register(new ChunkEventHandler()); ArclightMod.LOGGER.info("registry.forge-event"); } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ChunkEventHandler.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ChunkEventHandler.java deleted file mode 100644 index b70d7b24..00000000 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ChunkEventHandler.java +++ /dev/null @@ -1,36 +0,0 @@ -package io.izzel.arclight.common.mod.server.event; - -import io.izzel.arclight.common.bridge.core.world.chunk.ChunkBridge; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.Tag; -import net.minecraft.world.level.chunk.ChunkAccess; -import net.minecraft.world.level.chunk.ChunkStatus; -import net.minecraftforge.event.world.ChunkDataEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import org.bukkit.craftbukkit.v.persistence.CraftPersistentDataContainer; - -public class ChunkEventHandler { - - @SubscribeEvent - public void onChunkLoad(ChunkDataEvent.Load event) { - if (event.getStatus() == ChunkStatus.ChunkType.LEVELCHUNK) { - ChunkAccess chunk = event.getChunk(); - CompoundTag nbt = event.getData(); - Tag values = nbt.get("ChunkBukkitValues"); - if (values instanceof CompoundTag) { - ((ChunkBridge) chunk).bridge$getPersistentContainer().putAll((CompoundTag) values); - } - } - } - - @SubscribeEvent - public void onChunkSave(ChunkDataEvent.Save event) { - ChunkAccess chunk = event.getChunk(); - if (chunk instanceof ChunkBridge) { - CraftPersistentDataContainer container = ((ChunkBridge) chunk).bridge$getPersistentContainer(); - if (!container.isEmpty()) { - event.getData().put("ChunkBukkitValues", container.toTagCompound()); - } - } - } -}