mirror of
https://github.com/PaperMC/Paper.git
synced 2025-07-31 04:02:06 -07:00
35 lines
2.6 KiB
Diff
35 lines
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Sun, 2 Feb 2025 10:57:48 -0800
|
|
Subject: [PATCH] Do not record movement for vehicles/players unaffected by
|
|
blocks
|
|
|
|
If the player is not affected by movement through blocks, then
|
|
storing the movement would eventually invoke logic to apply effects
|
|
caused by moving through such blocks. For example, moving through
|
|
a portal in spectator mode and then later switching to creative mode
|
|
would portal the player.
|
|
|
|
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
index a0fea6f87000e17d1affc377d2b7e617ce345db6..a2c70d36f79b7f8560923e098e52fa7f82ca7416 100644
|
|
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -659,7 +659,7 @@ public class ServerGamePacketListenerImpl
|
|
// CraftBukkit end
|
|
|
|
this.player.serverLevel().getChunkSource().move(this.player);
|
|
- rootVehicle.recordMovementThroughBlocks(new Vec3(x, y, z), rootVehicle.position());
|
|
+ if (!rootVehicle.isSpectator() && rootVehicle.isAffectedByBlocks()) rootVehicle.recordMovementThroughBlocks(new Vec3(x, y, z), rootVehicle.position()); // Paper - Do not record movement for vehicles/players unaffected by blocks
|
|
Vec3 vec3 = new Vec3(rootVehicle.getX() - x, rootVehicle.getY() - y, rootVehicle.getZ() - z);
|
|
this.handlePlayerKnownMovement(vec3);
|
|
rootVehicle.setOnGroundWithMovement(packet.onGround(), vec3);
|
|
@@ -1578,7 +1578,7 @@ public class ServerGamePacketListenerImpl
|
|
Vec3 vec3 = new Vec3(this.player.getX() - x, this.player.getY() - y, this.player.getZ() - z);
|
|
this.player.setOnGroundWithMovement(packet.isOnGround(), packet.horizontalCollision(), vec3);
|
|
this.player.doCheckFallDamage(vec3.x, vec3.y, vec3.z, packet.isOnGround());
|
|
- this.player.recordMovementThroughBlocks(new Vec3(x, y, z), this.player.position());
|
|
+ if (!this.player.isSpectator() && this.player.isAffectedByBlocks()) this.player.recordMovementThroughBlocks(new Vec3(x, y, z), this.player.position()); // Paper - Do not record movement for vehicles/players unaffected by blocks
|
|
this.handlePlayerKnownMovement(vec3);
|
|
if (flag) {
|
|
this.player.resetFallDistance();
|