From c2087095582dc7ebffde68d550d9db091caed23a Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 3 Nov 2020 09:14:21 +0000 Subject: [PATCH] Updated Upstream (Bukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: eda400d3 SPIGOT-6213: MinecraftFont.getWidth(" ") returns 2 when it should be 3 Spigot Changes: aa477927 #100: Allow sending messages from specific UUIDs --- Spigot-API-Patches/0221-Brand-support.patch | 2 +- .../Add-Ban-Methods-to-Player-Objects.patch | 4 ++-- .../Add-Player-Client-Options-API.patch | 4 ++-- .../Player-Tab-List-and-Title-APIs.patch | 4 ++-- .../Player.setPlayerProfile-API.patch | 2 +- Spigot-API-Patches/Timings-v2.patch | 13 ++++++++----- work/Bukkit | 2 +- work/Spigot | 2 +- 8 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Spigot-API-Patches/0221-Brand-support.patch b/Spigot-API-Patches/0221-Brand-support.patch index fb1d191735..4b057b51c4 100644 --- a/Spigot-API-Patches/0221-Brand-support.patch +++ b/Spigot-API-Patches/0221-Brand-support.patch @@ -9,7 +9,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- 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, OfflinePlayer, PluginM - } + // Paper end } + // Paper start - brand support diff --git a/Spigot-API-Patches/Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/Add-Ban-Methods-to-Player-Objects.patch index 3c7ab2b1d5..8efa731f17 100644 --- a/Spigot-API-Patches/Add-Ban-Methods-to-Player-Objects.patch +++ b/Spigot-API-Patches/Add-Ban-Methods-to-Player-Objects.patch @@ -77,8 +77,8 @@ diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/buk index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -0,0 +0,0 @@ package org.bukkit.entity; - import java.net.InetSocketAddress; +@@ -0,0 +0,0 @@ import java.net.InetSocketAddress; + import java.util.UUID; import com.destroystokyo.paper.Title; // Paper import com.destroystokyo.paper.profile.PlayerProfile; // Paper +import java.util.Date; // Paper diff --git a/Spigot-API-Patches/Add-Player-Client-Options-API.patch b/Spigot-API-Patches/Add-Player-Client-Options-API.patch index bdc1ae8f30..9701aa4ede 100644 --- a/Spigot-API-Patches/Add-Player-Client-Options-API.patch +++ b/Spigot-API-Patches/Add-Player-Client-Options-API.patch @@ -179,10 +179,10 @@ diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/buk index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -0,0 +0,0 @@ - package org.bukkit.entity; +@@ -0,0 +0,0 @@ package org.bukkit.entity; import java.net.InetSocketAddress; + import java.util.UUID; +import com.destroystokyo.paper.ClientOption; // Paper import com.destroystokyo.paper.Title; // Paper import com.destroystokyo.paper.profile.PlayerProfile; // Paper diff --git a/Spigot-API-Patches/Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/Player-Tab-List-and-Title-APIs.patch index a14fb48b8f..5711dc0fe8 100644 --- a/Spigot-API-Patches/Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-API-Patches/Player-Tab-List-and-Title-APIs.patch @@ -387,10 +387,10 @@ diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/buk index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -0,0 +0,0 @@ - package org.bukkit.entity; +@@ -0,0 +0,0 @@ package org.bukkit.entity; import java.net.InetSocketAddress; + import java.util.UUID; +import com.destroystokyo.paper.Title; // Paper import org.bukkit.DyeColor; import org.bukkit.Effect; diff --git a/Spigot-API-Patches/Player.setPlayerProfile-API.patch b/Spigot-API-Patches/Player.setPlayerProfile-API.patch index 5e382e17fd..0d5922f21c 100644 --- a/Spigot-API-Patches/Player.setPlayerProfile-API.patch +++ b/Spigot-API-Patches/Player.setPlayerProfile-API.patch @@ -10,8 +10,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -0,0 +0,0 @@ package org.bukkit.entity; - import java.net.InetSocketAddress; + import java.util.UUID; import com.destroystokyo.paper.Title; // Paper +import com.destroystokyo.paper.profile.PlayerProfile; // Paper import org.bukkit.DyeColor; diff --git a/Spigot-API-Patches/Timings-v2.patch b/Spigot-API-Patches/Timings-v2.patch index aafb76df79..4fd3cfafb9 100644 --- a/Spigot-API-Patches/Timings-v2.patch +++ b/Spigot-API-Patches/Timings-v2.patch @@ -3379,14 +3379,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- 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, OfflinePlayer, PluginM - public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) { + */ + public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); - } + -+ public int getPing() -+ { -+ throw new UnsupportedOperationException( "Not supported yet." ); + } ++ ++ // Paper start ++ public int getPing() { ++ throw new UnsupportedOperationException( "Not supported yet." ); + } ++ // Paper end } @NotNull diff --git a/work/Bukkit b/work/Bukkit index 308851669a..eda400d3d7 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 308851669a4b264468e83cfb75215bff3638b2c0 +Subproject commit eda400d3d7f661c78c6128131d76f22f1dc113f5 diff --git a/work/Spigot b/work/Spigot index f011ca24f2..aa477927d3 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit f011ca24f2b53e0fb0e7a1cfa7afd5336a85beec +Subproject commit aa477927d347496adbacfea2617fe244ee1fb47b