diff --git a/Spigot-Server-Patches/Don-t-process-packets-from-offline-players.patch b/Spigot-Server-Patches/Don-t-process-packets-from-offline-players.patch
deleted file mode 100644
index d43c646d45..0000000000
--- a/Spigot-Server-Patches/Don-t-process-packets-from-offline-players.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alfie Cleveland <alfeh@me.com>
-Date: Sun, 27 Nov 2016 22:17:37 +0000
-Subject: [PATCH] Don't process packets from offline players
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityHuman.java
-+++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -0,0 +0,0 @@ import javax.annotation.Nullable;
- // CraftBukkit start
- import org.bukkit.craftbukkit.entity.CraftHumanEntity;
- import org.bukkit.craftbukkit.entity.CraftItem;
-+import org.bukkit.craftbukkit.entity.CraftPlayer; // Paper
- import org.bukkit.entity.Player;
- import org.bukkit.event.entity.EntityCombustByEntityEvent;
- import org.bukkit.event.player.PlayerBedEnterEvent;
-@@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
-     }
- 
-     protected boolean isFrozen() {
--        return this.getHealth() <= 0.0F || this.isSleeping();
-+        return this.getHealth() <= 0.0F || this.isSleeping() || (this.bukkitEntity != null && this.bukkitEntity instanceof CraftPlayer && !((CraftPlayer) this.bukkitEntity).isOnline()); // Paper - Pull #517
-     }
- 
-     public void closeInventory() {
---
\ No newline at end of file
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 41ade2f291..fffaf07113 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 41ade2f291c4596ac489606ca2b730b72b460dc2
+Subproject commit fffaf0711337e31b801c50556d1e6cf4c87c617a