PaperMC/patches/server/0870-Fix-NPE-on-Boat-getStatus.patch

33 lines
1.5 KiB
Diff
Raw Normal View History

2023-08-22 04:57:54 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: LemonCaramel <admin@caramel.moe>
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
2024-01-24 22:13:08 +01:00
index d161cbf9c83cd78593864850b98f688da2c85aa5..e33b1b6fd50a4eea57500cc00dba20d6edcab75d 100644
2023-08-22 04:57:54 +02:00
--- 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
2023-08-22 04:57:54 +02:00
+ final net.minecraft.world.entity.vehicle.Boat handle = this.getHandle();
+ if (handle.status == null) {
2024-01-24 22:13:08 +01:00
+ if (handle.valid) {
2023-08-22 04:57:54 +02:00
+ // Don't actually set the status because it would skew the old status check in the next tick
2023-08-22 05:05:47 +02:00
+ return CraftBoat.boatStatusFromNms(handle.getStatus());
2023-08-22 04:57:54 +02:00
+ } else {
+ return Status.NOT_IN_WORLD;
+ }
+ }
+ // Paper end - Fix NPE on Boat getStatus
2023-08-22 04:57:54 +02:00
return CraftBoat.boatStatusFromNms(this.getHandle().status);
}