33 Zeilen
1.5 KiB
Diff
33 Zeilen
1.5 KiB
Diff
|
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
|
||
|
|
index d7d54df20984352d84ffb9f7b7da583c34587b85..69ff732481ce6ba25bcfb27e5f9576bfa8019b8a 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
|
||
|
|
+ final net.minecraft.world.entity.vehicle.Boat handle = this.getHandle();
|
||
|
|
+ if (handle.status == null) {
|
||
|
|
+ if (handle.valid && !handle.updatingSectionStatus) {
|
||
|
|
+ // Don't actually set the status because it would skew the old status check in the next tick
|
||
|
|
+ return CraftBoat.boatStatusFromNms(this.getHandle().getStatus());
|
||
|
|
+ } else {
|
||
|
|
+ return Status.NOT_IN_WORLD;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
return CraftBoat.boatStatusFromNms(this.getHandle().status);
|
||
|
|
}
|
||
|
|
|