From 0061e1de8eaf1d4fe9c9f1c6261e8c405925bfcb Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Tue, 9 Apr 2024 19:25:41 -0400 Subject: [PATCH] Remove irrelevant mixin --- .../SortedArraySetMixin.java | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_spawn_chunks/SortedArraySetMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_spawn_chunks/SortedArraySetMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_spawn_chunks/SortedArraySetMixin.java deleted file mode 100644 index 814b2ca9..00000000 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_spawn_chunks/SortedArraySetMixin.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.embeddedt.modernfix.common.mixin.perf.remove_spawn_chunks; - -import com.llamalad7.mixinextras.injector.wrapoperation.Operation; -import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import net.minecraft.util.SortedArraySet; -import org.embeddedt.modernfix.ModernFix; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; - -@Mixin(SortedArraySet.class) -public class SortedArraySetMixin { - /** - * @author embeddedt - * @reason Make add() not crash with a null key, since some mods (Carpet) assume there will always be a spawn ticket, - * and then assume the reference they have is non-null (it can be null with this option enabled). - */ - @WrapOperation(method = "add", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/SortedArraySet;findIndex(Ljava/lang/Object;)I"), require = 0) - private int checkStatus(SortedArraySet instance, T object, Operation original) { - if(object == null) { - ModernFix.LOGGER.error("Attempted to insert a null key into SortedArraySet, ignoring"); - return 0; - } - return original.call(instance, object); - } -}