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 ==
|
2024-10-25 17:08:48 +02:00
|
|
|
public net.minecraft.world.entity.vehicle.AbstractBoat getStatus()Lnet/minecraft/world/entity/vehicle/AbstractBoat$Status;
|
2023-08-22 04:57:54 +02:00
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
|
2024-10-25 17:08:48 +02:00
|
|
|
index 5d51a49228eaee94f91cd04843e27c7918ca8796..ff82dc98478a8ac564bdbf4ec58da612e5f6c2ce 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
|
2024-10-24 10:42:29 +02:00
|
|
|
@@ -87,6 +87,17 @@ public abstract class CraftBoat extends CraftVehicle implements Boat {
|
2023-08-22 04:57:54 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public Status getStatus() {
|
2024-01-14 16:31:39 +01:00
|
|
|
+ // Paper start - Fix NPE on Boat getStatus
|
2024-10-25 17:08:48 +02:00
|
|
|
+ final net.minecraft.world.entity.vehicle.AbstractBoat handle = this.getHandle();
|
2023-08-22 04:57:54 +02:00
|
|
|
+ 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;
|
|
|
|
+ }
|
|
|
|
+ }
|
2024-01-14 16:31:39 +01:00
|
|
|
+ // Paper end - Fix NPE on Boat getStatus
|
2023-08-22 04:57:54 +02:00
|
|
|
return CraftBoat.boatStatusFromNms(this.getHandle().status);
|
|
|
|
}
|
|
|
|
|