DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix passengers getting stuck in unloaded chunks (fixes #606)

Browse Source 
We need to update the vehicle before its passengers.
This commit is contained in:
Jonas Herzig
2021-11-29 15:10:50 +01:00
parent 88a23222b6
commit d6cd917d9d
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/replaymod/replay/FullReplaySender.java
View File

@@ -55,6 +55,7 @@ import net.minecraft.network.packet.s2c.play.SignEditorOpenS2CPacket;
import net.minecraft.network.packet.s2c.play.StatisticsS2CPacket;
import net.minecraft.text.Text;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
@@ -1205,15 +1206,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
for (Entity entity : entitiesInChunk) {
// Skip interpolation of position updates coming from server
// (See: newX in EntityLivingBase or otherPlayerMPX in EntityOtherPlayerMP)
// Needs to be called at least 4 times thanks to
// EntityOtherPlayerMP#otherPlayerMPPosRotationIncrements (max vanilla value is 3)
for (int i = 0; i < 4; i++) {
//#if MC>=11400
entity.tick();
//#else
//$$ entity.onUpdate();
//#endif
}
forcePositionForVehicleAndSelf(entity);
// Check whether the entity has left the chunk
//#if MC>=11700
@@ -1284,6 +1277,26 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
return p; // During synchronous playback everything is sent normally
}
private void forcePositionForVehicleAndSelf(Entity entity) {
Entity vehicle = entity.getVehicle();
if (vehicle != null) {
forcePositionForVehicleAndSelf(vehicle);
}
// Skip interpolation of position updates coming from server
// (See: newX in EntityLivingBase or otherPlayerMPX in EntityOtherPlayerMP)
int ticks = 0;
Vec3d prevPos;
do {
prevPos = entity.getPos();
if (vehicle != null) {
entity.tickRiding();
} else {
entity.tick();
}
} while (prevPos.squaredDistanceTo(entity.getPos()) > 0.0001 && ticks++ < 100);
}
private static final class PacketData {
private static final com.github.steveice10.netty.buffer.ByteBuf byteBuf = com.github.steveice10.netty.buffer.Unpooled.buffer();
private static final NetOutput netOutput = new ByteBufNetOutput(byteBuf);