From dedd6e3c8f64c28d23b45676c249d9fde19bad22 Mon Sep 17 00:00:00 2001 From: gnembon Date: Mon, 31 Aug 2020 00:29:12 -0300 Subject: [PATCH] removed unloadedEntityFix since its no longer reproducible and causes entity duplications. Fixes #443 --- src/main/java/carpet/CarpetSettings.java | 3 --- .../ServerWorld_unloadedEntityMixin.java | 21 ------------------- src/main/resources/carpet.mixins.json | 1 - 3 files changed, 25 deletions(-) delete mode 100644 src/main/java/carpet/mixins/ServerWorld_unloadedEntityMixin.java diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 0863910c..8a0722e7 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -214,9 +214,6 @@ public class CarpetSettings ) public static boolean piglinsSpawningInBastions = false; - @Rule(desc = "Entities pushed or moved into unloaded chunks no longer disappear", category = {EXPERIMENTAL, BUGFIX}) - public static boolean unloadedEntityFix = false; - @Rule( desc = "TNT doesn't update when placed against a power source", category = {CREATIVE, TNT} ) public static boolean tntDoNotUpdate = false; diff --git a/src/main/java/carpet/mixins/ServerWorld_unloadedEntityMixin.java b/src/main/java/carpet/mixins/ServerWorld_unloadedEntityMixin.java deleted file mode 100644 index e9a70ba2..00000000 --- a/src/main/java/carpet/mixins/ServerWorld_unloadedEntityMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -package carpet.mixins; - -import carpet.CarpetSettings; -import net.minecraft.entity.Entity; -import net.minecraft.server.world.ServerWorld; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(ServerWorld.class) -public class ServerWorld_unloadedEntityMixin -{ - @Redirect(method = "checkEntityChunkPos", at = @At( - value = "INVOKE", - target = "Lnet/minecraft/entity/Entity;teleportRequested()Z" - )) - private boolean addFastEntityCheck(Entity entity) - { - return CarpetSettings.unloadedEntityFix || entity.teleportRequested(); - } -} diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index bc783228..d818e4e2 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -51,7 +51,6 @@ "ServerWorld_spawnChunksMixin", "MobEntityMixin", - "ServerWorld_unloadedEntityMixin", "EntityTrackerEntry_leashFixMixin", "VillagerEntity_aiMixin",