Update upstream B/CB/S

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

@@ -5,13 +5,13 @@ 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 148756b9..4ad0028c 100644
+index abf68a2c..fcb03b83 100644
 --- a/src/main/java/org/bukkit/command/CommandSender.java
 +++ b/src/main/java/org/bukkit/command/CommandSender.java
 @@ -0,0 +0,0 @@ public interface CommandSender extends Permissible {
-      * @return Name of the sender
-      */
-     public String getName();
+ 
+     Spigot spigot();
+     // Spigot end
 +
 +    // Paper start
 +    /**
@@ -40,7 +40,7 @@ index 148756b9..4ad0028c 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d19a928d..54d05113 100644
+index 34a9d696..78f877d9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline

Spigot-API-Patches/Add-String-based-Action-Bar-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f9d24bfd..2f7c96ee 100644
+index 05b88e5b..5c76497f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -65,8 +65,7 @@ index f9d24bfd..2f7c96ee 100644
           *
 +         * @deprecated This is unlikely the API you want to use. See {@link #sendActionBar(String)} for a more proper Action Bar API. This deprecated API may send unsafe items to the client.
           * @param position the screen position
--         * @param component the components to send
-+         * @param components the components to send
+          * @param components the components to send
           */
 +        @Deprecated
          public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {

Spigot-API-Patches/Add-command-to-reload-permissions.yml-and-require-co.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 9af61bad..43510bad 100644
+index 970d651b..4a725d79 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ public final class Bukkit {
@@ -24,13 +24,13 @@ index 9af61bad..43510bad 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a5750304..8922551f 100644
+index 9de7693a..3c550d06 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
-     }
  
      Spigot spigot();
+     // Spigot end
 +
 +    void reloadPermissions(); // Paper
  }

Spigot-API-Patches/Allow-Reloading-of-Command-Aliases.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 43510bad..76d250f7 100644
+index 4a725d79..4c20a1be 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ public final class Bukkit {
@@ -24,11 +24,11 @@ index 43510bad..76d250f7 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8922551f..b04b796a 100644
+index 3c550d06..4f077b7c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
-     Spigot spigot();
+     // Spigot end
  
      void reloadPermissions(); // Paper
 +

Spigot-API-Patches/Arrow-pickup-rule-API.patch

@@ -5,13 +5,14 @@ Subject: [PATCH] Arrow pickup rule API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
-index 1ff09518..da4678d0 100644
+index 5850ab6c..a8d1826a 100644
 --- a/src/main/java/org/bukkit/entity/Arrow.java
 +++ b/src/main/java/org/bukkit/entity/Arrow.java
 @@ -0,0 +0,0 @@ public interface Arrow extends Projectile {
-         CREATIVE_ONLY
-     }
- 
+     @Override
+     Spigot spigot();
+     // Spigot end
++
 +    // Paper start
 +    /**
 +     * Gets the {@link PickupRule} for this arrow.
@@ -45,8 +46,5 @@ index 1ff09518..da4678d0 100644
 +        CREATIVE_ONLY;
 +    }
 +    // Paper end
-+
-     public class Spigot extends Entity.Spigot
-     {
- 
+ }
 --

Spigot-API-Patches/Entity-Origin-API.patch

@@ -5,13 +5,13 @@ Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 69bdb460..c0b7426d 100644
+index 0144bef9..fbff9860 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
- 
+     @Override
      Spigot spigot();
-     // Spigot End
+     // Spigot end
 +
 +    // Paper start
 +    /**

Spigot-API-Patches/Expose-server-CommandMap.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 4f094f7b..5147cbda 100644
+index 89135b86..94ec8189 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ import org.bukkit.boss.BarColor;
@@ -39,7 +39,7 @@ index 4f094f7b..5147cbda 100644
      {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a503bb49..ed3a7197 100644
+index c81c073d..63624ff6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ import org.bukkit.boss.BarColor;

Spigot-API-Patches/Timings-v2.patch

@@ -2932,7 +2932,7 @@ index 00000000..3a288d2a
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ab3f6c0b..e1898343 100644
+index 5649aaf7..b7c939a2 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ public final class Bukkit {
@@ -2944,11 +2944,11 @@ index ab3f6c0b..e1898343 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d3fdd638..30b99241 100644
+index 7a08fd1e..7dd895a0 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
- 
+     // Spigot start
      public class Spigot
      {
 -
@@ -3054,7 +3054,7 @@ index 3f07d7f4..f89ad075 100644
      }
 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 00000000..66232339
+index 00000000..5527e7c8
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
 @@ -0,0 +0,0 @@
@@ -3156,6 +3156,12 @@ index 00000000..66232339
 +    default Set<PermissionAttachmentInfo> getEffectivePermissions() {
 +        throw new NotImplementedException();
 +    }
++
++    @Override
++    default Spigot spigot() {
++        throw new NotImplementedException();
++    }
++
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 index cdf838eb..39b275cb 100644
@@ -3451,7 +3457,7 @@ index a8f61f2d..00000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b57c81c1..d24ef805 100644
+index 9764caa4..266181aa 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -3465,7 +3471,7 @@ index b57c81c1..d24ef805 100644
 +        }
      }
  
-     Spigot spigot();
+     @Override
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 index e13d27d2..b43ffd36 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java