From 8fa10a1c676d23a5e2ac878395a9ce8c26c3ab09 Mon Sep 17 00:00:00 2001 From: Fallen_Breath Date: Thu, 21 Oct 2021 06:40:27 -0500 Subject: [PATCH 1/2] Fixed player ticking issue caused by rule updateSuppressionCrashFix (#1137) * Fixed player ticking issue caused by #1133 * use abstract class for ServerPlayerEntity_updateSuppressionCrashFixMixin --- ...rPlayerEntity_updateSuppressionCrashFixMixin.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/carpet/mixins/ServerPlayerEntity_updateSuppressionCrashFixMixin.java b/src/main/java/carpet/mixins/ServerPlayerEntity_updateSuppressionCrashFixMixin.java index b1c3c009..83a3fecd 100644 --- a/src/main/java/carpet/mixins/ServerPlayerEntity_updateSuppressionCrashFixMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayerEntity_updateSuppressionCrashFixMixin.java @@ -4,17 +4,23 @@ import carpet.CarpetSettings; import carpet.helpers.ThrowableSuppression; import carpet.logging.LoggerRegistry; import carpet.utils.Messenger; +import com.mojang.authlib.GameProfile; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.BaseText; import net.minecraft.util.crash.CrashException; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(ServerPlayerEntity.class) -public class ServerPlayerEntity_updateSuppressionCrashFixMixin { +public abstract class ServerPlayerEntity_updateSuppressionCrashFixMixin extends PlayerEntity { + + public ServerPlayerEntity_updateSuppressionCrashFixMixin(World world, BlockPos pos, float yaw, GameProfile profile) { + super(world, pos, yaw, profile); + } @Redirect( method = "playerTick()V", @@ -26,11 +32,11 @@ public class ServerPlayerEntity_updateSuppressionCrashFixMixin { ) private void fixUpdateSuppressionCrashPlayerTick(PlayerEntity playerEntity){ if (!CarpetSettings.updateSuppressionCrashFix) { - playerEntity.tick(); + super.tick(); return; } try { - playerEntity.tick(); + super.tick(); } catch (CrashException e) { if (!(e.getCause() instanceof ThrowableSuppression throwableSuppression)) throw e; logUpdateSuppressionPlayer(throwableSuppression.pos); From 9ac3654a2cea82b346f24246648cb6eacbdc4652 Mon Sep 17 00:00:00 2001 From: gnembon Date: Thu, 21 Oct 2021 08:43:52 -0300 Subject: [PATCH 2/2] 1.4.50 --- gradle.properties | 2 +- src/main/java/carpet/CarpetSettings.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 99d2024e..bdedd098 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G fabric_version=0.40.1+1.17 # Mod Properties - mod_version = 1.4.49 + mod_version = 1.4.50 maven_group = carpet archives_base_name = fabric-carpet diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 936ae753..7367ae4d 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -43,7 +43,7 @@ import static carpet.settings.RuleCategory.CLIENT; @SuppressWarnings("CanBeFinal") public class CarpetSettings { - public static final String carpetVersion = "1.4.49+v211021"; + public static final String carpetVersion = "1.4.50+v211021"; public static final Logger LOG = LogManager.getLogger("carpet"); public static ThreadLocal skipGenerationChecks = ThreadLocal.withInitial(() -> false); public static ThreadLocal impendingFillSkipUpdates = ThreadLocal.withInitial(() -> false);