Update upstream CB

--- work/CraftBukkit
Submodule work/CraftBukkit e4183e70..f489f0f7:
  > SPIGOT-4494: Remove fix for SPIGOT-3864, better handled by SPIGOT-3879 fix

Spigot-API-Patches/Support-cancellation-supression-of-EntityDismount-Ve.patch

@@ -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
 @@ -0,0 +0,0 @@ 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
 @@ -0,0 +0,0 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable

Spigot-Server-Patches/Configurable-inter-world-teleportation-safety.patch

@@ -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
 @@ -0,0 +0,0 @@ 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
-@@ -0,0 +0,0 @@ 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
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {