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