Merge 1.20 into 1.20.2

This commit is contained in:
embeddedt 2023-10-07 17:48:39 -04:00
commit 93554d1854

View File

@ -18,13 +18,13 @@ public class ServerGamePacketListenerImplMixin {
if(player == this.player) { if(player == this.player) {
// use positionRider // use positionRider
Vec3 oldPos = this.player.position(); Vec3 oldPos = this.player.position();
yRot = this.player.yRot; yRot = this.player.getYRot();
xRot = this.player.xRot; xRot = this.player.getXRot();
float yHeadRot = this.player.getYHeadRot(); float yHeadRot = this.player.getYHeadRot();
this.player.getRootVehicle().positionRider(this.player); this.player.getRootVehicle().positionRider(this.player);
// keep old rotation // keep old rotation
this.player.yRot = yRot; this.player.setYRot(yRot);
this.player.xRot = xRot; this.player.setXRot(xRot);
this.player.setYHeadRot(yHeadRot); this.player.setYHeadRot(yHeadRot);
// save old position // save old position
this.player.xo = oldPos.x; this.player.xo = oldPos.x;