From 1f38a2e89c541abc239d8666ef01edf0140a659c Mon Sep 17 00:00:00 2001
From: altrisi <altrisi.trillosierra@gmail.com>
Date: Fri, 20 Jan 2023 18:27:16 +0100
Subject: [PATCH] Remove `leadFix` rule

It's been fixed for ages, and the only code we still add is already in vanilla
---
 src/main/java/carpet/CarpetSettings.java      |  7 ----
 .../mixins/ServerEntity_leashFixMixin.java    | 34 -------------------
 src/main/resources/carpet.mixins.json         |  1 -
 3 files changed, 42 deletions(-)
 delete mode 100644 src/main/java/carpet/mixins/ServerEntity_leashFixMixin.java

diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java
index 3fe4c006..e10f72cf 100644
--- a/src/main/java/carpet/CarpetSettings.java
+++ b/src/main/java/carpet/CarpetSettings.java
@@ -864,13 +864,6 @@ public class CarpetSettings
     @Rule(desc = "fixes block placement rotation issue when player rotates quickly while placing blocks", category = RuleCategory.BUGFIX)
     public static boolean placementRotationFix = false;
 
-    @Rule(
-            desc = "Fixes leads breaking/becoming invisible in unloaded chunks",
-            extra = "You may still get visibly broken leash links on the client side, but server side the link is still there.",
-            category = RuleCategory.BUGFIX
-    )// needs checkfix for 1.15
-    public static boolean leadFix = false;
-
     @Rule(desc = "Spawning requires much less CPU and Memory", category = OPTIMIZATION)
     public static boolean lagFreeSpawning = false;
 
diff --git a/src/main/java/carpet/mixins/ServerEntity_leashFixMixin.java b/src/main/java/carpet/mixins/ServerEntity_leashFixMixin.java
deleted file mode 100644
index d2d71423..00000000
--- a/src/main/java/carpet/mixins/ServerEntity_leashFixMixin.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package carpet.mixins;
-
-import carpet.CarpetSettings;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.function.Consumer;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket;
-import net.minecraft.server.level.ServerEntity;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.Mob;
-
-@Mixin(ServerEntity.class)
-public class ServerEntity_leashFixMixin
-{
-    @Shadow @Final private Entity entity;
-
-    @Inject(method = "sendPairingData", at = @At("RETURN"))
-    private void sendLeashPackets(Consumer<Packet<?>> consumer_1, CallbackInfo ci)
-    {
-        if (CarpetSettings.leadFix)
-        {
-            if (entity instanceof Mob)
-            {
-                consumer_1.accept( new ClientboundSetEntityLinkPacket(entity, ((Mob) entity).getLeashHolder()));
-            }
-        }
-    }
-}
diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json
index a963ad4f..13bd6b23 100644
--- a/src/main/resources/carpet.mixins.json
+++ b/src/main/resources/carpet.mixins.json
@@ -54,7 +54,6 @@
     "ThreadedLevelLightEngine_scarpetChunkCreationMixin",
     "LivingEntity_cleanLogsMixin",
     "MobMixin",
-    "ServerEntity_leashFixMixin",
     "Villager_aiMixin",
     "Player_fakePlayersMixin",
     "ServerGamePacketListenerImpl_coreMixin",