diff --git a/Spigot-Server-Patches/0258-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0258-Enderman.teleportRandomly.patch
index 251d7f3520..c05ae8b6b0 100644
--- a/Spigot-Server-Patches/0258-Enderman.teleportRandomly.patch
+++ b/Spigot-Server-Patches/0258-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From 4e46fdb4d4dd7840a38112aae13fbb25c6170d9c Mon Sep 17 00:00:00 2001
+From 247294cb19dc83b384646f7a329f44a277022c91 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:29:44 -0400
 Subject: [PATCH] Enderman.teleportRandomly()
@@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index a766b38959..0f64c8f2b5 100644
+index a766b3895..0f64c8f2b 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -184,6 +184,7 @@ public class EntityEnderman extends EntityMonster {
@@ -18,17 +18,17 @@ index a766b38959..0f64c8f2b5 100644
          double d0 = this.locX + (this.random.nextDouble() - 0.5D) * 64.0D;
          double d1 = this.locY + (double) (this.random.nextInt(64) - 32);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-index 5998530a8f..f62ea821fc 100644
+index b81693d9f..9bc6a6c0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-@@ -16,6 +16,7 @@ public class CraftEnderman extends CraftMonster implements Enderman {
+@@ -17,6 +17,7 @@ public class CraftEnderman extends CraftMonster implements Enderman {
          super(server, entity);
      }
  
 +    @Override public boolean teleportRandomly() { return getHandle().teleportRandomly(); } // Paper
      public MaterialData getCarriedMaterial() {
          IBlockData blockData = getHandle().getCarried();
-         return CraftMagicNumbers.getMaterial(blockData);
+         return (blockData == null) ? Material.AIR.getNewData((byte) 0) : CraftMagicNumbers.getMaterial(blockData);
 -- 
 2.18.0
 
diff --git a/work/Bukkit b/work/Bukkit
index 290eb7296a..dde07e23c8 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 290eb7296a2c24e0385c913850197311208f63f0
+Subproject commit dde07e23c89024c7a63299a447842600f2e06cf1
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 4a24108665..452a173807 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 4a241086654d1331eaf51c749306a04ae224e7f1
+Subproject commit 452a173807261fbf8c016223277bd26cb77c62d1