From 0ccb26c7bed3f10e9a6c10aa929104adecb3120c Mon Sep 17 00:00:00 2001 From: mworzala Date: Sun, 27 Nov 2022 15:47:59 +0200 Subject: [PATCH] hollow-cube/entity-get-instance-unknown-nullability Signed-off-by: mworzala Entity#getInstance to @UnknownNullability (cherry picked from commit 35fc7a1127b2189515991bfdf0f7fd0dc92af09e) (cherry picked from commit bc73a6cbf8fd658ff275aee0ea140ea1a788356a) --- CHANGELOG.md | 8 ++++++++ src/main/java/net/minestom/server/entity/Entity.java | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..c1d5b52af --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,8 @@ +## Changelog +Not a "proper" versioned changelog, just a list of the changes from Minestom master. +Some of these are pending, some deserve PRs, others are just minor tweaks + +* Delete extensions (`mworzala/Minestom` @ `no_more_extensions`) +* Block face in digging events (`mworzala/Minestom` @ `block_break_face`) +* Add cursor position to block place and neighbor updates (`Moulberry/Minestom` @ `block_placement_rewrite_2`) +* Change `Entity#getInstance` to @UnknownNullability diff --git a/src/main/java/net/minestom/server/entity/Entity.java b/src/main/java/net/minestom/server/entity/Entity.java index daf0ece5b..eda76548f 100644 --- a/src/main/java/net/minestom/server/entity/Entity.java +++ b/src/main/java/net/minestom/server/entity/Entity.java @@ -64,6 +64,7 @@ import net.minestom.server.utils.validate.Check; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.UnknownNullability; import space.vectrix.flare.fastutil.Int2ObjectSyncMap; import java.time.Duration; @@ -838,7 +839,7 @@ public class Entity implements Viewable, Tickable, Schedulable, Snapshotable, Ev * * @return the entity instance, can be null if the entity doesn't have an instance yet */ - public @Nullable Instance getInstance() { + public @UnknownNullability Instance getInstance() { return instance; }