Finish converting all events to jspecify annotations

This commit is contained in:
Jake Potrebic 2024-09-29 16:48:34 -07:00
parent ea00be3aaa
commit ba3c29b92e
No known key found for this signature in database
GPG key ID: ECE0B3C133C016C5
82 changed files with 977 additions and 1103 deletions

View file

@ -6,10 +6,10 @@ Subject: [PATCH] added PlayerNameEntityEvent
diff --git a/src/main/java/io/papermc/paper/event/player/PlayerNameEntityEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerNameEntityEvent.java
new file mode 100755
index 0000000000000000000000000000000000000000..84736d4a438e9023fbdeac1aea4d8b741cc39b61
index 0000000000000000000000000000000000000000..fb990180d9958fe2bbe44e86aa360102f37be9ed
--- /dev/null
+++ b/src/main/java/io/papermc/paper/event/player/PlayerNameEntityEvent.java
@@ -0,0 +1,110 @@
@@ -0,0 +1,107 @@
+package io.papermc.paper.event.player;
+
+import net.kyori.adventure.text.Component;
@ -19,24 +19,25 @@ index 0000000000000000000000000000000000000000..84736d4a438e9023fbdeac1aea4d8b74
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Called when the player is attempting to rename a mob
+ */
+@NullMarked
+public class PlayerNameEntityEvent extends PlayerEvent implements Cancellable {
+
+ private static final HandlerList HANDLER_LIST = new HandlerList();
+
+ private LivingEntity entity;
+ private Component name;
+ private @Nullable Component name;
+ private boolean persistent;
+
+ private boolean cancelled;
+
+ @ApiStatus.Internal
+ public PlayerNameEntityEvent(@NotNull Player player, @NotNull LivingEntity entity, @NotNull Component name, boolean persistent) {
+ public PlayerNameEntityEvent(final Player player, final LivingEntity entity, final Component name, final boolean persistent) {
+ super(player);
+ this.entity = entity;
+ this.name = name;
@ -48,8 +49,7 @@ index 0000000000000000000000000000000000000000..84736d4a438e9023fbdeac1aea4d8b74
+ *
+ * @return the name
+ */
+ @Nullable
+ public Component getName() {
+ public @Nullable Component getName() {
+ return this.name;
+ }
+
@ -58,7 +58,7 @@ index 0000000000000000000000000000000000000000..84736d4a438e9023fbdeac1aea4d8b74
+ *
+ * @param name the name
+ */
+ public void setName(@Nullable Component name) {
+ public void setName(final @Nullable Component name) {
+ this.name = name;
+ }
+
@ -67,7 +67,6 @@ index 0000000000000000000000000000000000000000..84736d4a438e9023fbdeac1aea4d8b74
+ *
+ * @return the entity
+ */
+ @NotNull
+ public LivingEntity getEntity() {
+ return this.entity;
+ }
@ -77,7 +76,7 @@ index 0000000000000000000000000000000000000000..84736d4a438e9023fbdeac1aea4d8b74
+ *
+ * @param entity the entity
+ */
+ public void setEntity(@NotNull LivingEntity entity) {
+ public void setEntity(final LivingEntity entity) {
+ this.entity = entity;
+ }
+
@ -95,7 +94,7 @@ index 0000000000000000000000000000000000000000..84736d4a438e9023fbdeac1aea4d8b74
+ *
+ * @param persistent persistent
+ */
+ public void setPersistent(boolean persistent) {
+ public void setPersistent(final boolean persistent) {
+ this.persistent = persistent;
+ }
+
@ -105,17 +104,15 @@ index 0000000000000000000000000000000000000000..84736d4a438e9023fbdeac1aea4d8b74
+ }
+
+ @Override
+ public void setCancelled(boolean cancel) {
+ public void setCancelled(final boolean cancel) {
+ this.cancelled = cancel;
+ }
+
+ @NotNull
+ @Override
+ public HandlerList getHandlers() {
+ return HANDLER_LIST;
+ }
+
+ @NotNull
+ public static HandlerList getHandlerList() {
+ return HANDLER_LIST;
+ }