aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0888-Fix-NPE-on-Boat-getStatus.patch
diff options
context:
space:
mode:
authorRiley Park <[email protected]>2024-05-15 17:06:59 -0700
committerGitHub <[email protected]>2024-05-15 17:06:59 -0700
commitf17519338bc589c045e0b32bfc37e048b23544d5 (patch)
treee50182ec698b4a9de8f366f485ee089b1901bbd9 /patches/server/0888-Fix-NPE-on-Boat-getStatus.patch
parent3fc93581bb876e8149b2ca423375a98f5ca12d27 (diff)
downloadPaper-f17519338bc589c045e0b32bfc37e048b23544d5.tar.gz
Paper-f17519338bc589c045e0b32bfc37e048b23544d5.zip
Expose server build information (#10729)
* Expose server build information * squash patches * final tweaks --------- Co-authored-by: Jake Potrebic <[email protected]> Co-authored-by: masmc05 <[email protected]>
Diffstat (limited to 'patches/server/0888-Fix-NPE-on-Boat-getStatus.patch')
-rw-r--r--patches/server/0888-Fix-NPE-on-Boat-getStatus.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/patches/server/0888-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0888-Fix-NPE-on-Boat-getStatus.patch
new file mode 100644
index 0000000000..70323a4352
--- /dev/null
+++ b/patches/server/0888-Fix-NPE-on-Boat-getStatus.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: LemonCaramel <[email protected]>
+Date: Mon, 10 Apr 2023 20:48:26 +0900
+Subject: [PATCH] Fix NPE on Boat getStatus
+
+Boat status is null until the entity is added to the world and the tick() method is called.
+
+== AT ==
+public net.minecraft.world.entity.vehicle.Boat getStatus()Lnet/minecraft/world/entity/vehicle/Boat$Status;
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
+index d161cbf9c83cd78593864850b98f688da2c85aa5..e33b1b6fd50a4eea57500cc00dba20d6edcab75d 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
+@@ -88,6 +88,17 @@ public class CraftBoat extends CraftVehicle implements Boat {
+
+ @Override
+ public Status getStatus() {
++ // Paper start - Fix NPE on Boat getStatus
++ final net.minecraft.world.entity.vehicle.Boat handle = this.getHandle();
++ if (handle.status == null) {
++ if (handle.valid) {
++ // Don't actually set the status because it would skew the old status check in the next tick
++ return CraftBoat.boatStatusFromNms(handle.getStatus());
++ } else {
++ return Status.NOT_IN_WORLD;
++ }
++ }
++ // Paper end - Fix NPE on Boat getStatus
+ return CraftBoat.boatStatusFromNms(this.getHandle().status);
+ }
+