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

This reverts commit 23826a3f66.

Spigot-API-Patches/0004-Timings-v2.patch

@@ -1876,10 +1876,10 @@ index 0000000000000000000000000000000000000000..ef824d701c97cad8b31e76ad98c94fc4
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..ef58a6c00f444bd498a2d8fc4e457236f393954f
+index 0000000000000000000000000000000000000000..bf3e059fe06aae361b2ded451914ed19b5e970c5
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsReportListener.java
-@@ -0,0 +1,77 @@
+@@ -0,0 +1,75 @@
 +package co.aikar.timings;
 +
 +import com.google.common.collect.Lists;
@@ -1891,8 +1891,6 @@ index 0000000000000000000000000000000000000000..ef58a6c00f444bd498a2d8fc4e457236
 +import org.bukkit.command.RemoteConsoleCommandSender;
 +
 +import java.util.List;
-+import java.util.UUID;
-+
 +import org.jetbrains.annotations.NotNull;
 +import org.jetbrains.annotations.Nullable;
 +
@@ -2929,10 +2927,10 @@ index d6c8938b1e13b63116b7b0e074ea8ef5997f8dc3..a6ad94ef98a1df1d2842635d850bc990
      }
 diff --git a/src/main/java/org/bukkit/command/MessageCommandSender.java b/src/main/java/org/bukkit/command/MessageCommandSender.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..a7ef1f51c2b96617a32e6e7b1723e8770ba8a6a8
+index 0000000000000000000000000000000000000000..ca1893e9fb41baae0d103f1a925e33f3dfa273be
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
-@@ -0,0 +1,129 @@
+@@ -0,0 +1,114 @@
 +package org.bukkit.command;
 +
 +import org.apache.commons.lang.NotImplementedException;
@@ -2944,10 +2942,7 @@ index 0000000000000000000000000000000000000000..a7ef1f51c2b96617a32e6e7b1723e877
 +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..a7ef1f51c2b96617a32e6e7b1723e877
 +        }
 +    }
 +
-+    @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() {

Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
 
 
 diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
-index fe6b162fe55cddf3f9be40fa4cd42e5060ac85ad..cab682f741da6bbf7463b457ce1674accce6f5f2 100644
+index a9020ecc744514067374bd2b1751251add4d9a78..d3b3a8bf94dac370ea254875e4d4a30894a70c67 100644
 --- a/src/main/java/org/bukkit/command/CommandSender.java
 +++ b/src/main/java/org/bukkit/command/CommandSender.java
-@@ -79,4 +79,30 @@ public interface CommandSender extends Permissible {
+@@ -61,4 +61,30 @@ public interface CommandSender extends Permissible {
      @NotNull
      Spigot spigot();
      // Spigot end

Spigot-API-Patches/0131-Provide-Chunk-Coordinates-as-a-Long-API.patch

@@ -7,10 +7,10 @@ Allows you to easily access the chunks X/z as a long, and a method
 to look up by the long key too.
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index beac1439c71fb28f1a3baecf56157237e12ccfd5..fa576096e908f8fbdbef53e1bd91215ac9e73ed6 100644
+index 95e485eea693e7648e63d198c8591d89e02e6755..0bbef14a9fc2a3ec03b4db59c8d8e1eedc0ad1c1 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
-@@ -28,6 +28,32 @@ public interface Chunk extends PersistentDataHolder {
+@@ -27,6 +27,32 @@ public interface Chunk {
       */
      int getZ();
  

Spigot-API-Patches/0134-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
 
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index fa576096e908f8fbdbef53e1bd91215ac9e73ed6..b4ef6297f78d1f0c216e718024a21e6aa07cd1c6 100644
+index 0bbef14a9fc2a3ec03b4db59c8d8e1eedc0ad1c1..11b691cf59b4a72493c91055fd8c46d7681b4527 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
-@@ -103,13 +103,26 @@ public interface Chunk extends PersistentDataHolder {
+@@ -102,13 +102,26 @@ public interface Chunk {
      @NotNull
      Entity[] getEntities();