mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Use mojang item ids for alternative item despawn rate (#6997)

Browse source
This commit is contained in:
Noah van der Aa 2022-05-05 00:29:15 +02:00 • committed by GitHub
parent e5da93a608
commit 2ab0258b5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
216 changed files with 194 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

19
patches/server/0777-Ensure-valid-vehicle-status.patch Normal file
View file

@ -0,0 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
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 0b567dfbf7c3971858707bcde6909323a7a2634f..ca978f337a7cf443e6918bea2e6cae0ceef30145 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -504,7 +504,7 @@ public class ServerPlayer extends Player {
}
}
- if (persistVehicle && entity1 != null && entity != this && entity.hasExactlyOnePlayerPassenger()) {
+ if (persistVehicle && entity1 != null && entity != this && entity.hasExactlyOnePlayerPassenger() && !entity.isRemoved()) { // Paper
// CraftBukkit end
CompoundTag nbttagcompound2 = new CompoundTag();
CompoundTag nbttagcompound3 = new CompoundTag();