Fix FishingHookMeta NPE

This commit is contained in:
themode 2021-04-05 20:55:51 +02:00
parent 7a6fb4d601
commit 008b7fb223

View File

@ -1,12 +1,11 @@
package net.minestom.server.entity.metadata.other;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import net.minestom.server.entity.Entity;
import net.minestom.server.entity.Metadata;
import net.minestom.server.entity.metadata.EntityMeta;
import net.minestom.server.entity.metadata.ObjectDataProvider;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class FishingHookMeta extends EntityMeta implements ObjectDataProvider {
@ -27,15 +26,6 @@ public class FishingHookMeta extends EntityMeta implements ObjectDataProvider {
int entityID = value == null ? 0 : value.getEntityId() + 1;
super.metadata.setIndex((byte) 7, Metadata.VarInt(entityID));
}
@NotNull
public Entity getOwnerEntity() {
return owner;
}
public void setOwnerEntity(@NotNull Entity value) {
this.owner = value;
}
public boolean isCatchable() {
return super.metadata.getIndex((byte) 8, false);
@ -45,9 +35,18 @@ public class FishingHookMeta extends EntityMeta implements ObjectDataProvider {
super.metadata.setIndex((byte) 8, Metadata.Boolean(value));
}
@Nullable
public Entity getOwnerEntity() {
return owner;
}
public void setOwnerEntity(@Nullable Entity value) {
this.owner = value;
}
@Override
public int getObjectData() {
return owner.getEntityId();
return owner != null ? owner.getEntityId() : 0;
}
@Override