From 0e6f024eda4b018c9865d1564d9abdd4192f658c Mon Sep 17 00:00:00 2001 From: Automated Date: Fri, 12 Oct 2018 18:46:42 -0400 Subject: [PATCH] [Auto] Updated Upstream (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 CraftBukkit Changes: e7ced970 Catch plugins setting null Material or BlockData to blocks --- .../API-to-get-a-BlockState-without-a-snapshot.patch | 2 +- work/CraftBukkit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Spigot-Server-Patches/API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/API-to-get-a-BlockState-without-a-snapshot.patch index 43f2c89c67..be11e4fef4 100644 --- a/Spigot-Server-Patches/API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-Server-Patches/API-to-get-a-BlockState-without-a-snapshot.patch @@ -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 922266441d..96e188b3ad 100644 +index f19df71fc3..f4c0c0c5e2 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -0,0 +0,0 @@ public class CraftBlock implements Block { diff --git a/work/CraftBukkit b/work/CraftBukkit index 8ab46ff7c6..e7ced970d2 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 8ab46ff7c68434c9be24f191ce0126b656a86a0d +Subproject commit e7ced970d291b283a6fe01462d2222bf673b4cd3