From 3d9d40656ebd1fa56e489ff811408d99588bd867 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Tue, 7 Dec 2021 17:46:15 +0100 Subject: [PATCH] Fix recording of riptide animation (fixes #581) This code supposedly meant for recording when a player was eating/blocking was never needed to begin with cause the server echos all data in DataTracker anyway, and now it broke the riptide animation because that's part of the living flags as well but wasn't considered here, i.e. unconditionally overwritten. --- .../handler/RecordingEventHandler.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java b/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java index 2a7cee0f..4ccc2d9e 100644 --- a/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java +++ b/src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java @@ -41,12 +41,10 @@ import java.util.Collections; //#endif //#if MC>=10904 -import com.replaymod.recording.mixin.EntityLivingBaseAccessor; import net.minecraft.network.packet.s2c.play.EntityTrackerUpdateS2CPacket; import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket; import net.minecraft.network.packet.s2c.play.WorldEventS2CPacket; import net.minecraft.entity.EquipmentSlot; -import net.minecraft.entity.data.DataTracker; import net.minecraft.util.Hand; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; @@ -73,10 +71,6 @@ public class RecordingEventHandler extends EventRegistrations { private boolean wasSleeping; private int lastRiding = -1; private Integer rotationYawHeadBefore; - //#if MC>=10904 - private boolean wasHandActive; - private Hand lastActiveHand; - //#endif public RecordingEventHandler(PacketListener packetListener) { this.packetListener = packetListener; @@ -335,18 +329,6 @@ public class RecordingEventHandler extends EventRegistrations { wasSleeping = false; } - //#if MC>=10904 - // Active hand (e.g. eating, drinking, blocking) - if (player.isUsingItem() ^ wasHandActive || player.getActiveHand() != lastActiveHand) { - wasHandActive = player.isUsingItem(); - lastActiveHand = player.getActiveHand(); - DataTracker dataManager = new DataTracker(null); - int state = (wasHandActive ? 1 : 0) | (lastActiveHand == Hand.OFF_HAND ? 2 : 0); - dataManager.startTracking(EntityLivingBaseAccessor.getLivingFlags(), (byte) state); - packetListener.save(new EntityTrackerUpdateS2CPacket(player.getEntityId(), dataManager, true)); - } - //#endif - } catch(Exception e1) { e1.printStackTrace(); }