From 6cd928f83e63310834e38c4c79bbeae41f783382 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 24 Sep 2018 01:06:42 -0400 Subject: [PATCH] [Auto] 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: 6f57bf95 SPIGOT-4391: Sign editable API CraftBukkit Changes: 5cffeca2 SPIGOT-4391: Sign editable API --- ...PI-to-get-a-BlockState-without-a-snapshot.patch | 14 +++++++------- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Spigot-Server-Patches/0219-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0219-API-to-get-a-BlockState-without-a-snapshot.patch index f16a7044c0..d788477a12 100644 --- a/Spigot-Server-Patches/0219-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-Server-Patches/0219-API-to-get-a-BlockState-without-a-snapshot.patch @@ -1,4 +1,4 @@ -From ebb2afdc3c8ca00cf538b5b2afe82908db6df9bf Mon Sep 17 00:00:00 2001 +From cf1e2c6930915e0804226f7e3d6e067bfcb43b33 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 6 Nov 2017 21:08:22 -0500 Subject: [PATCH] API to get a BlockState without a snapshot @@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE If Tile Entity was null, correct Sign to return empty lines instead of null diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index b3c5766a27..29fe031d85 100644 +index b3c5766a2..29fe031d8 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -206,7 +206,12 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -39,7 +39,7 @@ index b3c5766a27..29fe031d85 100644 return null; } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 370a222f83..f493ebc4f3 100644 +index 922266441..96e188b3a 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -267,6 +267,20 @@ public class CraftBlock implements Block { @@ -64,7 +64,7 @@ index 370a222f83..f493ebc4f3 100644 switch (material) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index 0558cafe31..d4d9c5fc50 100644 +index 0558cafe3..d4d9c5fc5 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -23,20 +23,40 @@ public class CraftBlockEntityState extends CraftBlockState @@ -114,10 +114,10 @@ index 0558cafe31..d4d9c5fc50 100644 private T createSnapshot(T tileEntity, World world) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java -index 7a8d445299..97b4e6910d 100644 +index e6f86cc4b..3a8f64360 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java -@@ -14,10 +14,12 @@ public class CraftSign extends CraftBlockEntityState implements +@@ -15,10 +15,12 @@ public class CraftSign extends CraftBlockEntityState implements public CraftSign(final Block block) { super(block, TileEntitySign.class); @@ -131,5 +131,5 @@ index 7a8d445299..97b4e6910d 100644 @Override -- -2.18.0 +2.19.0 diff --git a/work/Bukkit b/work/Bukkit index 4db9e3dc04..6f57bf95de 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 4db9e3dc04dc7f53b888d37733b680de86c1be84 +Subproject commit 6f57bf95de3ab77effbe58c103ecf471fdeac581 diff --git a/work/CraftBukkit b/work/CraftBukkit index dcb43ef83d..5cffeca21f 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit dcb43ef83dd0dc8b26e9923eaeed82b659ab5780 +Subproject commit 5cffeca21fcb6266999d8b5fbda443eee58d996f