From 97152a6ace7c1f2ebf2f7d7e98c4cde35dcb7057 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Mon, 8 Jan 2024 16:11:35 -0500 Subject: [PATCH] Clear event phase before reusing object (#170) --- .../early/sodium/MixinBiomeGenBase.java | 2 ++ .../angelica/utils/EventUtils.java | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 src/main/java/com/gtnewhorizons/angelica/utils/EventUtils.java diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinBiomeGenBase.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinBiomeGenBase.java index 0f180678f..8ea312f59 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinBiomeGenBase.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinBiomeGenBase.java @@ -1,5 +1,6 @@ package com.gtnewhorizons.angelica.mixins.early.sodium; +import com.gtnewhorizons.angelica.utils.EventUtils; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.event.terraingen.BiomeEvent; import org.spongepowered.asm.mixin.Mixin; @@ -19,6 +20,7 @@ public class MixinBiomeGenBase { @Unique private void prepareEvent(BiomeEvent.BiomeColor event, int defaultColor) { event.newColor = defaultColor; + EventUtils.clearPhase(event); ((AccessorBiomeColorEvent)event).setOriginalColor(defaultColor); } diff --git a/src/main/java/com/gtnewhorizons/angelica/utils/EventUtils.java b/src/main/java/com/gtnewhorizons/angelica/utils/EventUtils.java new file mode 100644 index 000000000..0c4609c6c --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/utils/EventUtils.java @@ -0,0 +1,28 @@ +package com.gtnewhorizons.angelica.utils; + +import cpw.mods.fml.common.eventhandler.Event; +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.relauncher.ReflectionHelper; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; + +public class EventUtils { + private static final MethodHandle EVENT_PHASE; + + static { + try { + EVENT_PHASE = MethodHandles.publicLookup().unreflectSetter(ReflectionHelper.findField(Event.class, "phase")); + } catch (IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + public static void clearPhase(Event e) { + try { + EVENT_PHASE.invokeExact(e, (EventPriority)null); + } catch(Throwable ex) { + throw new RuntimeException(ex); + } + } +}