OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 07:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix NPE on Boat getStatus

Browse source 
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.AbstractBoat getStatus()Lnet/minecraft/world/entity/vehicle/AbstractBoat$Status;
This commit is contained in:
LemonCaramel 2023-04-10 20:48:26 +09:00
parent edb4225d90
commit e39a789ec6
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
View file

@ -87,6 +87,17 @@ public abstract class CraftBoat extends CraftVehicle implements Boat {
@Override
public Status getStatus() {
// Paper start - Fix NPE on Boat getStatus
final net.minecraft.world.entity.vehicle.AbstractBoat 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);
}