From 5591eeb4c26f83a1116cd5b2105e58e31fc8be53 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 27 Aug 2020 14:37:37 +0100 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) 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: 323d6ca3 #535: Add EntityCategory API to LivingEntity 7d3323d8 #526: Add Block#applyBoneMeal() CraftBukkit Changes: bf451617 SPIGOT-6109: Improve loot handling bfea4559 SPIGOT-6111: NPE in CraftHumanEntity#openWorkbench & CraftHumanEntity#openEnchanting ee7116b4 Add note to CONTRIBUTING.md to suggest keeping commit messages / titles the same eae15943 #721: Add EntityCategory API to LivingEntity 8c611560 #702: Add Block#applyBoneMeal() 8408de02 #716: Fix barrel open API playing sound twice 74b6982b #711: Add Full RGB support to the console --- .../Add-effect-to-block-break-naturally.patch | 2 +- ...methods-for-working-with-arrows-stuck-in-living-.patch | 4 ++-- ...methods-for-working-with-arrows-stuck-in-living-.patch | 4 ++-- ...TerminalConsoleAppender-for-console-improvements.patch | 8 +++----- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Spigot-API-Patches/Add-effect-to-block-break-naturally.patch b/Spigot-API-Patches/Add-effect-to-block-break-naturally.patch index 01ae314d0a..9af2e514d7 100644 --- a/Spigot-API-Patches/Add-effect-to-block-break-naturally.patch +++ b/Spigot-API-Patches/Add-effect-to-block-break-naturally.patch @@ -25,5 +25,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper end + /** - * Returns a list of items which would drop by destroying this block + * Simulate bone meal application to this block (if possible). * diff --git a/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch index d6f8ba8ea9..4a6b56a8d5 100644 --- a/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -9,9 +9,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource - * @param the type of the passed value */ - void setMemory(@NotNull MemoryKey memoryKey, @Nullable T memoryValue); + @NotNull + public EntityCategory getCategory(); + + // Paper start + /** diff --git a/Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch index c7e1d1ee84..783d0a067c 100644 --- a/Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -9,8 +9,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { - public void setMemory(MemoryKey memoryKey, T t) { - getHandle().getBehaviorController().setMemory(CraftMemoryKey.fromMemoryKey(memoryKey), CraftMemoryMapper.toNms(t)); + + throw new UnsupportedOperationException("Unsupported monster type: " + type + ". This is a bug, report this to Spigot."); } + + // Paper start diff --git a/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch index 3b26010d1e..c1be3d8be3 100644 --- a/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch @@ -339,10 +339,10 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender. index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java -@@ -0,0 +0,0 @@ package org.bukkit.craftbukkit.command; - - import java.util.EnumMap; +@@ -0,0 +0,0 @@ import java.util.EnumMap; import java.util.Map; + import java.util.regex.Matcher; + import java.util.regex.Pattern; -import jline.Terminal; +//import jline.Terminal; import org.bukkit.Bukkit; @@ -351,8 +351,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 import org.bukkit.craftbukkit.CraftServer; -import org.fusesource.jansi.Ansi; -import org.fusesource.jansi.Ansi.Attribute; -+//import org.fusesource.jansi.Ansi; -+//import org.fusesource.jansi.Ansi.Attribute; -public class ColouredConsoleSender extends CraftConsoleCommandSender { +public class ColouredConsoleSender /*extends CraftConsoleCommandSender */{/* // Paper - disable diff --git a/work/Bukkit b/work/Bukkit index 29e9b367a4..323d6ca318 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 29e9b367a4abdf77098b02318c22f24b92a218d2 +Subproject commit 323d6ca31870ea42606ba2a6a75f3f7e0f2248b2 diff --git a/work/CraftBukkit b/work/CraftBukkit index 049120068d..bf451617f3 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 049120068dee7b541ecab95fc8cf03f7e76f8337 +Subproject commit bf451617f359f811ec8179a30af8e8b0c6ea2144