From 6a60c4295d5053a9616724797690d8fff86ecbd6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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
---
 .../0217-API-to-get-a-BlockState-without-a-snapshot.patch | 8 ++++----
 work/CraftBukkit                                          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Spigot-Server-Patches/0217-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0217-API-to-get-a-BlockState-without-a-snapshot.patch
index a64012946b..399bb3e2c3 100644
--- a/Spigot-Server-Patches/0217-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0217-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From c579bd8a4185d49e669eea46646c157d71201936 Mon Sep 17 00:00:00 2001
+From f274e65f30c13edff060cd5f343b54a830399712 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:08:22 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@@ -39,10 +39,10 @@ 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
-@@ -267,6 +267,20 @@ public class CraftBlock implements Block {
+@@ -269,6 +269,20 @@ public class CraftBlock implements Block {
      }
  
      public BlockState getState() {
@@ -131,5 +131,5 @@ index e6f86cc4b1..3a8f643609 100644
  
      @Override
 -- 
-2.19.0
+2.19.1
 
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