Revert "Updated Upstream (Bukkit/CraftBukkit/Spigot)"

This reverts commit d833a4aeef.

Spigot-API-Patches/Timings-v2.patch

@@ -1891,8 +1891,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import org.bukkit.command.RemoteConsoleCommandSender;
 +
 +import java.util.List;
-+import java.util.UUID;
-+
 +import org.jetbrains.annotations.NotNull;
 +import org.jetbrains.annotations.Nullable;
 +
@@ -2944,10 +2942,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import org.bukkit.plugin.Plugin;
 +
 +import java.util.Set;
-+import java.util.UUID;
-+
 +import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
 +
 +/**
 + * For when all you care about is just messaging
@@ -2961,18 +2956,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +    }
 +
-+    @Override
-+    default void sendMessage(@Nullable UUID sender, @NotNull String message) {
-+        sendMessage(message);
-+    }
-+
-+    @Override
-+    default void sendMessage(@Nullable UUID sender, @NotNull String[] messages) {
-+        for (String message : messages) {
-+            sendMessage(message);
-+        }
-+    }
-+
 +    @NotNull
 +    @Override
 +    default Server getServer() {