From a53a01b082e5abcf0c90b444b403fe79cb66b59f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 8 Aug 2018 04:14: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:
497877c3 Add getHardness and getBlastResistance to Material

CraftBukkit Changes:
c4220dc2 Add Unit Tests for geHardness and getBlastResistance
---
 work/Bukkit      | 2 +-
 work/CraftBukkit | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/work/Bukkit b/work/Bukkit
index 935f75dea0..497877c30c 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 935f75dea0c1f4721dd7666295f5036ed1ddbca2
+Subproject commit 497877c30c12d5f06e5b676e8b45f33776ab0c7c
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 53d3ac0a97..c4220dc24f 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 53d3ac0a970b311f51c97a6652bb49d550c3067e
+Subproject commit c4220dc24ff459639108d17aa63be152e3964b79