twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-08 16:12:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Begin switching to JSpecify annotations (#11448)

Browse Source 
* Begin switching to JSpecify annotations

* more

* fixes
This commit is contained in:
Jake Potrebic
2024-09-29 12:52:13 -07:00
parent fa1f6a5d78
commit 64e918335c
62 changed files with 580 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
patches/api/Add-WardenAngerChangeEvent.patch
View File

@@ -21,14 +21,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.entity.EntityEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Range;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Called when a Warden's anger level has changed due to another entity.
+ * <p>
+ * If the event is cancelled, the warden's anger level will not change.
+ */
+@NullMarked
+public class WardenAngerChangeEvent extends EntityEvent implements Cancellable {
+
+ private static final HandlerList HANDLER_LIST = new HandlerList();
@@ -40,7 +41,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ private boolean cancelled;
+
+ @ApiStatus.Internal
+ public WardenAngerChangeEvent(@NotNull final Warden warden, @NotNull final Entity target, final int oldAnger, final int newAnger) {
+ public WardenAngerChangeEvent(final Warden warden, final Entity target, final int oldAnger, final int newAnger) {
+ super(warden);
+ this.target = target;
+ this.oldAnger = oldAnger;
@@ -52,7 +53,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ *
+ * @return triggering entity
+ */
+ @NotNull
+ public Entity getTarget() {
+ return this.target;
+ }
@@ -63,8 +63,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * @return old anger level
+ * @see Warden#getAnger(Entity)
+ */
+ @Range(from = 0, to = 150)
+ public int getOldAnger() {
+ public @Range(from = 0, to = 150) int getOldAnger() {
+ return this.oldAnger;
+ }
+
@@ -74,8 +73,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * @return new anger level
+ * @see Warden#getAnger(Entity)
+ */
+ @Range(from = 0, to = 150)
+ public int getNewAnger() {
+ public @Range(from = 0, to = 150) int getNewAnger() {
+ return this.newAnger;
+ }
+
@@ -85,15 +83,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * The anger of a warden is capped at 150.
+ *
+ * @param newAnger the new anger level, max 150
+ * @see Warden#setAnger(Entity, int)
+ * @throws IllegalArgumentException if newAnger is greater than 150
+ * @see Warden#setAnger(Entity, int)
+ */
+ public void setNewAnger(@Range(from = 0, to = 150) int newAnger) {
+ public void setNewAnger(final @Range(from = 0, to = 150) int newAnger) {
+ Preconditions.checkArgument(newAnger <= 150, "newAnger must not be greater than 150");
+ this.newAnger = newAnger;
+ }
+
+ @NotNull
+ @Override
+ public Warden getEntity() {
+ return (Warden) super.getEntity();
@@ -105,17 +102,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ }
+
+ @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;
+ }