mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
76 lines
3.8 KiB
Diff
76 lines
3.8 KiB
Diff
From de59281517ca699748b4f5846bff6d35ebfdec4d Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Tue, 31 Dec 2019 23:00:07 -0600
|
|
Subject: [PATCH] Remove pointless annotations
|
|
|
|
---
|
|
src/main/java/org/bukkit/command/CommandExecutor.java | 2 +-
|
|
src/main/java/org/bukkit/command/TabCompleter.java | 2 +-
|
|
src/main/java/org/bukkit/plugin/java/JavaPlugin.java | 4 ++--
|
|
src/test/java/org/bukkit/AnnotationTest.java | 5 +++++
|
|
4 files changed, 9 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/main/java/org/bukkit/command/CommandExecutor.java b/src/main/java/org/bukkit/command/CommandExecutor.java
|
|
index 45cb8da1..383b43e1 100644
|
|
--- a/src/main/java/org/bukkit/command/CommandExecutor.java
|
|
+++ b/src/main/java/org/bukkit/command/CommandExecutor.java
|
|
@@ -19,5 +19,5 @@ public interface CommandExecutor {
|
|
* @param args Passed command arguments
|
|
* @return true if a valid command, otherwise false
|
|
*/
|
|
- public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args);
|
|
+ public boolean onCommand(CommandSender sender, Command command, String label, String[] args); // Purpur - remove pointless annotations
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/command/TabCompleter.java b/src/main/java/org/bukkit/command/TabCompleter.java
|
|
index e9cf71f5..34d3462c 100644
|
|
--- a/src/main/java/org/bukkit/command/TabCompleter.java
|
|
+++ b/src/main/java/org/bukkit/command/TabCompleter.java
|
|
@@ -23,5 +23,5 @@ public interface TabCompleter {
|
|
* to default to the command executor
|
|
*/
|
|
@Nullable
|
|
- public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args);
|
|
+ public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args); // Purpur - remove pointless annotations
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
|
|
index 04fa3991..24d65491 100644
|
|
--- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
|
|
+++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
|
|
@@ -287,7 +287,7 @@ public abstract class JavaPlugin extends PluginBase {
|
|
* {@inheritDoc}
|
|
*/
|
|
@Override
|
|
- public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
|
|
+ public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { // Purpur - remove pointless annotations
|
|
return false;
|
|
}
|
|
|
|
@@ -296,7 +296,7 @@ public abstract class JavaPlugin extends PluginBase {
|
|
*/
|
|
@Override
|
|
@Nullable
|
|
- public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
|
|
+ public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) { // Purpur - remove pointless annotations
|
|
return null;
|
|
}
|
|
|
|
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
|
|
index a48be38b..951b81e7 100644
|
|
--- a/src/test/java/org/bukkit/AnnotationTest.java
|
|
+++ b/src/test/java/org/bukkit/AnnotationTest.java
|
|
@@ -41,6 +41,11 @@ public class AnnotationTest {
|
|
"org/bukkit/plugin/java/PluginClassLoader",
|
|
// Generic functional interface
|
|
"org/bukkit/util/Consumer",
|
|
+ // Purpur start
|
|
+ "org/bukkit/command/CommandExecutor",
|
|
+ "org/bukkit/command/TabCompleter",
|
|
+ "org/bukkit/plugin/java/JavaPlugin",
|
|
+ // Purpur end
|
|
// Paper start
|
|
// Timings history is broken in terms of nullability due to guavas Function defining that the param is NonNull
|
|
"co/aikar/timings/TimingHistory$2",
|
|
--
|
|
2.24.0
|
|
|