diff --git a/Spigot-Server-Patches/0333-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0333-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index af494d274e..80b059725b 100644
--- a/Spigot-Server-Patches/0333-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-Server-Patches/0333-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,14 +1,14 @@
-From 31da49d27c56548c3381a2aeda3548d6f89e088a Mon Sep 17 00:00:00 2001
+From c9264f8c58b0da91bead0c09f1768e39b26501c8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:16:34 -0400
 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 0a47353b48..3238ca7420 100644
+index 76d395c4ed..12c6d850d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-@@ -96,7 +96,12 @@ public class CraftChunk implements Chunk {
+@@ -99,7 +99,12 @@ public class CraftChunk implements Chunk {
          return entities;
      }
  
@@ -21,7 +21,7 @@ index 0a47353b48..3238ca7420 100644
          int index = 0;
          net.minecraft.server.Chunk chunk = getHandle();
  
-@@ -108,7 +113,7 @@ public class CraftChunk implements Chunk {
+@@ -111,7 +116,7 @@ public class CraftChunk implements Chunk {
              }
  
              BlockPosition position = (BlockPosition) obj;
diff --git a/work/Bukkit b/work/Bukkit
index 410a601d00..9736896362 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 410a601d008d1c13612815b900f28c00ac4b90a6
+Subproject commit 9736896362b5ff5e6d79f3201983b9b3c2ddda26
diff --git a/work/CraftBukkit b/work/CraftBukkit
index a1ab86d8cb..3831ae621f 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit a1ab86d8cb5e264c2a4032c3729407534d21d33a
+Subproject commit 3831ae621f5b75add3ad528b1f07dd30c154fcae