From 3455cde27064f043f7edec8ea999290b4c803e47 Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Sat, 24 Sep 2022 09:31:44 +1000 Subject: [PATCH] Improve annotation test on parameters By: md_5 --- .../java/org/bukkit/event/entity/VillagerCareerChangeEvent.java | 2 +- .../src/main/java/org/bukkit/event/world/TimeSkipEvent.java | 2 +- paper-api/src/test/java/org/bukkit/AnnotationTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/event/entity/VillagerCareerChangeEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/VillagerCareerChangeEvent.java index b550029cf..346899bc0 100644 --- a/paper-api/src/main/java/org/bukkit/event/entity/VillagerCareerChangeEvent.java +++ b/paper-api/src/main/java/org/bukkit/event/entity/VillagerCareerChangeEvent.java @@ -60,7 +60,7 @@ public class VillagerCareerChangeEvent extends EntityEvent implements Cancellabl } @Override - public void setCancelled(@NotNull boolean cancel) { + public void setCancelled(boolean cancel) { cancelled = cancel; } diff --git a/paper-api/src/main/java/org/bukkit/event/world/TimeSkipEvent.java b/paper-api/src/main/java/org/bukkit/event/world/TimeSkipEvent.java index e18dbc305..cb50cbbb2 100644 --- a/paper-api/src/main/java/org/bukkit/event/world/TimeSkipEvent.java +++ b/paper-api/src/main/java/org/bukkit/event/world/TimeSkipEvent.java @@ -18,7 +18,7 @@ public class TimeSkipEvent extends WorldEvent implements Cancellable { private final SkipReason skipReason; private long skipAmount; - public TimeSkipEvent(@NotNull World world, @NotNull SkipReason skipReason, @NotNull long skipAmount) { + public TimeSkipEvent(@NotNull World world, @NotNull SkipReason skipReason, long skipAmount) { super(world); this.skipReason = skipReason; this.skipAmount = skipAmount; diff --git a/paper-api/src/test/java/org/bukkit/AnnotationTest.java b/paper-api/src/test/java/org/bukkit/AnnotationTest.java index 0c7377247..4ac3dd977 100644 --- a/paper-api/src/test/java/org/bukkit/AnnotationTest.java +++ b/paper-api/src/test/java/org/bukkit/AnnotationTest.java @@ -74,7 +74,7 @@ public class AnnotationTest { List parameters = method.parameters; for (int i = 0; i < paramTypes.length; i++) { - if (mustBeAnnotated(paramTypes[i]) && !isWellAnnotated(method.invisibleParameterAnnotations == null ? null : method.invisibleParameterAnnotations[i])) { + if (mustBeAnnotated(paramTypes[i]) ^ isWellAnnotated(method.invisibleParameterAnnotations == null ? null : method.invisibleParameterAnnotations[i])) { ParameterNode paramNode = parameters == null ? null : parameters.get(i); String paramName = paramNode == null ? null : paramNode.name;