diff --git a/Bukkit b/Bukkit
index cd53bd9895..db1761e3c9 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit cd53bd98952d61f137c9e4320bb69b79b3424644
+Subproject commit db1761e3c9dd2a74cda188145a5d3dc9da57f712
diff --git a/CraftBukkit b/CraftBukkit
index c5d27c5f6f..0ff499cf03 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit c5d27c5f6fcaf184d7d9c913bb3ac463e354991e
+Subproject commit 0ff499cf03a013e8999042d6e758ecab6ddf41b6
diff --git a/Spigot-Server-Patches/Only-mark-player-as-invulnerable-if-they-re-changing.patch b/Spigot-Server-Patches/Only-mark-player-as-invulnerable-if-they-re-changing.patch
deleted file mode 100644
index 5b65d390c4..0000000000
--- a/Spigot-Server-Patches/Only-mark-player-as-invulnerable-if-they-re-changing.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <1254957+zachbr@users.noreply.github.com>
-Date: Sun, 20 Mar 2016 19:40:51 -0500
-Subject: [PATCH] Only mark player as invulnerable if they're changing worlds
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     private boolean cg = true;
-     private long ch = System.currentTimeMillis();
-     private Entity ci = null;
--    private boolean cj;
-+    protected boolean cj; // Paper - private -> protected
-     private int containerCounter;
-     public boolean f;
-     public int ping;
-@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     }
- 
-     public Entity c(int i) {
--        this.cj = true;
-+        //this.cj = true; // Moved down and into PlayerList#changeDimension
-         if (this.dimension == 1 && i == 1) {
-+            this.cj = true; // Paper - Moved down
-             this.world.kill(this);
-             if (!this.viewingCredits) {
-                 this.viewingCredits = true;
-diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -0,0 +0,0 @@ public abstract class PlayerList {
-         Location exit = null;
-         boolean useTravelAgent = false; // don't use agent for custom worlds or return from THE_END
-         if (exitWorld != null) {
-+            entityplayer.cj = true; // Paper - Set teleport invulnerability only if they're actually changing worlds
-             if ((cause == TeleportCause.END_PORTAL) && (i == 0)) {
-                 // THE_END -> NORMAL; use bed if available, otherwise default spawn
-                 exit = ((org.bukkit.craftbukkit.entity.CraftPlayer) entityplayer.getBukkitEntity()).getBedSpawnLocation();
---
\ No newline at end of file