From aa3b9e8ed45b9a866b02394a7bde4a521b6af465 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 18 Sep 2019 20:55:55 -0300 Subject: [PATCH] fix merge erorrs --- .../java/carpet/mixins/RenderTickCounter_tickSpeedMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/carpet/mixins/RenderTickCounter_tickSpeedMixin.java b/src/main/java/carpet/mixins/RenderTickCounter_tickSpeedMixin.java index d2f1fe7a..1b115fd1 100644 --- a/src/main/java/carpet/mixins/RenderTickCounter_tickSpeedMixin.java +++ b/src/main/java/carpet/mixins/RenderTickCounter_tickSpeedMixin.java @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; public class RenderTickCounter_tickSpeedMixin { @Redirect(method = "beginRenderTick", at = @At( value = "FIELD", - target = "Lnet/minecraft/client/render/RenderTickCounter;tickTime:F" + target = "Lnet/minecraft/client/render/RenderTickCounter;timeScale:F" )) private float adjustTickSpeed(RenderTickCounter counter) { if (CarpetSettings.smoothClientAnimations && TickSpeed.process_entities)