diff --git a/Spigot-API-Patches/0167-Support-cancellation-supression-of-EntityDismount-Ve.patch b/Spigot-API-Patches/0168-Support-cancellation-supression-of-EntityDismount-Ve.patch
similarity index 96%
rename from Spigot-API-Patches/0167-Support-cancellation-supression-of-EntityDismount-Ve.patch
rename to Spigot-API-Patches/0168-Support-cancellation-supression-of-EntityDismount-Ve.patch
index 8e1f16c5b4..8c7d3734fe 100644
--- a/Spigot-API-Patches/0167-Support-cancellation-supression-of-EntityDismount-Ve.patch
+++ b/Spigot-API-Patches/0168-Support-cancellation-supression-of-EntityDismount-Ve.patch
@@ -1,4 +1,4 @@
-From f1d6f2a88ce9419dcfc9ae177fd077c1e60c6eb6 Mon Sep 17 00:00:00 2001
+From 9cc1d43c347c163357f283529d7fd0a9cefb5474 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 15:53:43 +0000
 Subject: [PATCH] Support cancellation supression of EntityDismount/VehicleExit
@@ -21,7 +21,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
-index 364451b56..b3269db2e 100644
+index 364451b5..b3269db2 100644
 --- a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
 +++ b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
 @@ -12,10 +12,18 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable {
@@ -64,7 +64,7 @@ index 364451b56..b3269db2e 100644
      public HandlerList getHandlers() {
          return handlers;
 diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-index 4110d3bb2..555899efc 100644
+index 4110d3bb..555899ef 100644
 --- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
 +++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
 @@ -15,11 +15,20 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable
diff --git a/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch b/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch
index 1259312a80..a9e5dae111 100644
--- a/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch
+++ b/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch
@@ -1,4 +1,4 @@
-From 4aa958cd75e6b558fc25887fb204d69eb97fd2a8 Mon Sep 17 00:00:00 2001
+From e2c17e451f8f9e556faa6e431910468d7bfcbd8e Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Configurable inter-world teleportation safety
@@ -16,7 +16,7 @@ The wanted destination was on top of the emerald block however the player ended
 This only is the case if the player is teleporting between worlds.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9db394d4..50837d76 100644
+index 9db394d4f..50837d767 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -190,4 +190,9 @@ public class PaperWorldConfig {
@@ -29,21 +29,8 @@ index 9db394d4..50837d76 100644
 +        disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 4a843d52..7dfb2bee 100644
---- a/src/main/java/net/minecraft/server/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -793,7 +793,7 @@ public abstract class PlayerList {
-         exitWorld.getTravelAgent().adjustExit(entityplayer, exit, velocity);
- 
-         entityplayer.worldChangeInvuln = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
--        this.moveToWorld(entityplayer, exitWorld.dimension, true, exit, true); // SPIGOT-3864
-+        this.moveToWorld(entityplayer, exitWorld.dimension, true, exit, !exitWorld.paperConfig.disableTeleportationSuffocationCheck); // SPIGOT-3864 // Paper GH-1149 - Tie suffocation check to config option
-         if (entityplayer.motX != velocity.getX() || entityplayer.motY != velocity.getY() || entityplayer.motZ != velocity.getZ()) {
-             entityplayer.getBukkitEntity().setVelocity(velocity);
-         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9e51645c..15a99220 100644
+index 9de5d0c69..0c35c94b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -714,7 +714,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -57,5 +44,5 @@ index 9e51645c..15a99220 100644
          return true;
      }
 -- 
-2.19.0
+2.19.1
 
diff --git a/work/CraftBukkit b/work/CraftBukkit
index e4183e7069..f489f0f745 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit e4183e7069107a8e2bdb9b1d3f30a663e27614d3
+Subproject commit f489f0f745f54783835475b980a3aee4b5cdfcf0