diff options
| author | Newwind <[email protected]> | 2024-08-31 19:29:50 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-08-31 20:29:50 +0200 |
| commit | 509ea2fd17fa03ce04f86046098607733b8767ba (patch) | |
| tree | 3f7c9a29481fafbb6ad9f846839ec8f4863d2363 /patches/server/0616-Ensure-valid-vehicle-status.patch | |
| parent | e01ddf46279fbb68d157749a906b7a2ecc60da1a (diff) | |
| download | Paper-509ea2fd17fa03ce04f86046098607733b8767ba.tar.gz Paper-509ea2fd17fa03ce04f86046098607733b8767ba.zip | |
Fix horse armor desync (#11341)
Diffstat (limited to 'patches/server/0616-Ensure-valid-vehicle-status.patch')
| -rw-r--r-- | patches/server/0616-Ensure-valid-vehicle-status.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0616-Ensure-valid-vehicle-status.patch b/patches/server/0616-Ensure-valid-vehicle-status.patch new file mode 100644 index 0000000000..f8ce44340d --- /dev/null +++ b/patches/server/0616-Ensure-valid-vehicle-status.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nassim Jahnke <[email protected]> +Date: Tue, 28 Sep 2021 09:47:47 +0200 +Subject: [PATCH] Ensure valid vehicle status + + +diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java +index 6648af4d8d795637fae444dc85803b399592fd7d..25ca370c0b19eca529fc2c980c50e899013f0897 100644 +--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java ++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +@@ -574,7 +574,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { + } + } + +- if (persistVehicle && entity1 != null && entity != this && entity.hasExactlyOnePlayerPassenger()) { ++ if (persistVehicle && entity1 != null && entity != this && entity.hasExactlyOnePlayerPassenger() && !entity.isRemoved()) { // Paper - Ensure valid vehicle status + // CraftBukkit end + CompoundTag nbttagcompound2 = new CompoundTag(); + CompoundTag nbttagcompound3 = new CompoundTag(); |