Remove teleport with vehicle patch (broken)

patches/server/0044-Add-chance-for-zombie-horse-natural-spawns.patch

@@ -1,4 +1,4 @@
-From 1fa689c176d239c642467dce58be851d62441be7 Mon Sep 17 00:00:00 2001
+From ce047122254937ebf8c457cfc7e02125699be970 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 7 Jul 2019 19:52:16 -0500
 Subject: [PATCH] Add chance for zombie horse natural spawns
@@ -8,7 +8,7 @@ Subject: [PATCH] Add chance for zombie horse natural spawns
  1 file changed, 12 insertions(+), 6 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 8c08cf612a..42cee6ab9e 100644
+index fb2f35e9d4..b2cfdecb4a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -396,12 +396,18 @@ public class WorldServer extends World {

patches/server/0044-Teleport-with-vehicle-passenger.patch

@@ -1,70 +0,0 @@
-From 8a8144d39ecf8d43839857ec8f7902d7b080af38 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 7 Jul 2019 18:25:05 -0500
-Subject: [PATCH] Teleport with vehicle/passenger
-
----
- .../craftbukkit/entity/CraftEntity.java       | 20 +++++++++++++++++--
- .../craftbukkit/entity/CraftPlayer.java       |  4 +++-
- 2 files changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 15042943c9..9782c510aa 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -494,16 +494,32 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-         Preconditions.checkArgument(location != null, "location");
-         location.checkFinite();
- 
--        if (entity.isVehicle() || entity.dead) {
-+        if (entity.dead) { // Purpur
-             return false;
-         }
- 
-+        if (entity.getVehicle() != null) return entity.getVehicle().getBukkitEntity().teleport(location, cause); // Purpur
-+
-         // If this entity is riding another entity, we must dismount before teleporting.
-         entity.stopRiding();
- 
-         // Let the server handle cross world teleports
-         if (!location.getWorld().equals(getWorld())) {
--            entity.teleportTo(((CraftWorld) location.getWorld()).getHandle().getWorldProvider().getDimensionManager(), new BlockPosition(location.getX(), location.getY(), location.getZ()));
-+            // Purpur start
-+            net.minecraft.server.DimensionManager dimension = ((CraftWorld) location.getWorld()).getHandle().getWorldProvider().getDimensionManager();
-+            BlockPosition position = new BlockPosition(location.getX(), location.getY(), location.getZ());
-+            if(entity.isVehicle()) {
-+                Entity passenger = entity.getPassengers().get(0);
-+                entity.ejectPassengers();
-+                Entity newEntity = entity.teleportTo(dimension, position);
-+                Entity newPassenger = passenger instanceof EntityPlayer ? server.getHandle().moveToWorld((EntityPlayer) passenger, dimension, true, location, true) : passenger.teleportTo(dimension, position);
-+                if (newEntity != null && newPassenger != null) {
-+                    newPassenger.startRiding(newEntity);
-+                }
-+            } else {
-+                entity.teleportTo(dimension, position);
-+            }
-+            // Purpur end
-             return true;
-         }
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c94944dfe0..cd16edb418 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -752,10 +752,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-            return false;
-         }
- 
--        if (entity.isVehicle()) {
-+        if (false && entity.isVehicle()) { // Purpur
-             return false;
-         }
- 
-+        if (entity.getVehicle() != null) return entity.getVehicle().getBukkitEntity().teleport(location, cause); // Purpur
-+
-         // From = Players current Location
-         Location from = this.getLocation();
-         // To = Players new Location if Teleport is Successful
--- 
-2.20.1
-

patches/server/0045-Fix-pig-zombies-MC-56653.patch

@@ -1,4 +1,4 @@
-From 28196eef8c75872f29151e8ef55efeb160ed2212 Mon Sep 17 00:00:00 2001
+From 30cc7ef0d3916f1d67bad78d6995c27ae8e5d562 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 9 Jul 2019 20:56:47 -0500
 Subject: [PATCH] Fix pig zombies (MC-56653)
@@ -8,7 +8,7 @@ Subject: [PATCH] Fix pig zombies (MC-56653)
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index e76842a57b..fa056b8b22 100644
+index 5760a18361..4a3383cbf8 100644
 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
 @@ -139,6 +139,7 @@ public class EntityPigZombie extends EntityZombie {

patches/server/0046-Allow-leashing-villagers.patch

@@ -1,4 +1,4 @@
-From eedea43314bdeab2c223c8befbbe9c71162e0136 Mon Sep 17 00:00:00 2001
+From c510e3b8cfac083db24028b6c4bd8f907e88658f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 10 Jul 2019 20:14:07 -0500
 Subject: [PATCH] Allow leashing villagers

patches/server/0047-Option-to-toggle-milk-curing-bad-omen.patch

@@ -1,4 +1,4 @@
-From dc3aaf12abc1d8aff4345c7758ae801f83f64a39 Mon Sep 17 00:00:00 2001
+From 26bbf6c515f4af206676c24d64d14bebfd76d3e8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 10 Jul 2019 20:43:05 -0500
 Subject: [PATCH] Option to toggle milk curing bad omen
@@ -9,7 +9,7 @@ Subject: [PATCH] Option to toggle milk curing bad omen
  2 files changed, 7 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/ItemMilkBucket.java b/src/main/java/net/minecraft/server/ItemMilkBucket.java
-index a6477d26a..f76e611ca 100644
+index a6477d26ac..f76e611ca4 100644
 --- a/src/main/java/net/minecraft/server/ItemMilkBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemMilkBucket.java
 @@ -20,7 +20,9 @@ public class ItemMilkBucket extends Item {
@@ -23,7 +23,7 @@ index a6477d26a..f76e611ca 100644
  
          return itemstack.isEmpty() ? new ItemStack(Items.BUCKET) : itemstack;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 542e1b329..3ec048adf 100644
+index 542e1b3299..3ec048adf3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -117,6 +117,11 @@ public class PurpurWorldConfig {

patches/server/0048-Implement-ChunkTooLargeEvent.patch

@@ -1,4 +1,4 @@
-From 1394bec8ee78bd00371ee774e4b9f8f1596b73cd Mon Sep 17 00:00:00 2001
+From 2568a50fe3f2535447bd74c47e81b76dd68cae83 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 12 Jul 2019 02:10:06 -0500
 Subject: [PATCH] Implement ChunkTooLargeEvent

patches/server/0049-Prevent-entities-from-loading-unloaded-chunks.patch

@@ -1,4 +1,4 @@
-From 0053b709510e354de23738f70d82e816fa55c91b Mon Sep 17 00:00:00 2001
+From b8edd4e6184a256af73d90f2707200022b505cd8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 12 Jul 2019 16:18:55 -0500
 Subject: [PATCH] Prevent entities from loading unloaded chunks

patches/server/0050-Tulips-change-fox-type.patch

@@ -1,4 +1,4 @@
-From 87de3aa9cbefd8013634bdb1273a3db75be5bd21 Mon Sep 17 00:00:00 2001
+From acb7f96aff0481141efdff38ffeeec018fd971b7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 13 Jul 2019 15:56:22 -0500
 Subject: [PATCH] Tulips change fox type

patches/server/0051-Mending-mends-most-damages-equipment-first.patch

@@ -1,4 +1,4 @@
-From 8b08ce21aecf36ba70992db752a5ef348e955001 Mon Sep 17 00:00:00 2001
+From 5e53ddfb020b762f3d0d3db4f8f8f2280c060783 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 14 Jul 2019 19:52:47 -0500
 Subject: [PATCH] Mending mends most damages equipment first

patches/server/0052-Asynchronous-chunk-IO-and-loading.patch

@@ -1,4 +1,4 @@
-From b9183f7b5c1a9ecf2ecfe8e1ac16ce168cafaf4a Mon Sep 17 00:00:00 2001
+From 63a3866ef5cccf783042f255d664176a0387719f Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 13 Jul 2019 09:23:10 -0700
 Subject: [PATCH] Asynchronous chunk IO and loading

patches/server/0053-Reduce-sync-loads.patch

@@ -1,4 +1,4 @@
-From cbb3beeb5bafdd41a7ee4b1840d02c68dc3868a9 Mon Sep 17 00:00:00 2001
+From 73f697ee7a133943f7917cab9b6862e2e7668aa0 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 19 Jul 2019 03:29:14 -0700
 Subject: [PATCH] Reduce sync loads

patches/server/0054-implement-optional-per-player-mob-spawns.patch

@@ -1,4 +1,4 @@
-From 29083c3116e83b4cf3b6fe9022e8d2f372f43c20 Mon Sep 17 00:00:00 2001
+From 25ba7be0350d6cecf3f97c1b8f3c15cb76cab74b Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Tue, 11 Jun 2019 22:22:16 -0400
 Subject: [PATCH] implement optional per player mob spawns

patches/server/0055-Players-should-not-cram-to-death.patch

@@ -1,4 +1,4 @@
-From 6f8989fe5f0b31e34732a75629fd21faf197287c Mon Sep 17 00:00:00 2001
+From 4c2b9892be3d3a3df60c14dac35f005ecd763c91 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:01:46 -0500
 Subject: [PATCH] Players should not cram to death

patches/server/0056-Ladders-should-not-bypass-cramming-gamerule.patch

@@ -1,4 +1,4 @@
-From ac28dfadae1f57e33186f99b14d3f77fdb498f68 Mon Sep 17 00:00:00 2001
+From 7da353e9f6f6296fde0996f119824c2ea287a493 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:06:20 -0500
 Subject: [PATCH] Ladders should not bypass cramming gamerule
@@ -26,7 +26,7 @@ index cfe21c2e70..1857cfb877 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a14553a799..1fb6e8e052 100644
+index aa60c00842..4e6598cf5a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2609,7 +2609,7 @@ public abstract class EntityLiving extends Entity {

patches/server/0057-Implement-a-hard-limit-for-pillager-outpost-spawns.patch

@@ -1,4 +1,4 @@
-From 38094095f810058cd996cb092a77a0787c910e25 Mon Sep 17 00:00:00 2001
+From f3cab74b82e2eb7faa7d5da4d4654318eb99abdd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 14:24:26 -0500
 Subject: [PATCH] Implement a hard limit for pillager outpost spawns

patches/server/0058-Implement-configurable-search-radius-for-villagers-t.patch

@@ -1,4 +1,4 @@
-From e9d6ce7c7c718b19d3c2e95a2e083b9c91262bff Mon Sep 17 00:00:00 2001
+From 3bee4bd1b4435f72a658e951f512ab1effde64ef Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 17:32:17 -0500
 Subject: [PATCH] Implement configurable search radius for villagers to spawn

patches/server/0059-Implement-lagging-threshold.patch

@@ -1,4 +1,4 @@
-From ff9f394de1b59c5f933c62674945088cca62b415 Mon Sep 17 00:00:00 2001
+From 9f65c68e7f315074b3b16e408c8cc072356d36eb Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:16 -0500
 Subject: [PATCH] Implement lagging threshold

patches/server/0060-Implement-configurable-villager-brain-ticks.patch

@@ -1,4 +1,4 @@
-From ba81b317d984abec1c5bbe377c5122b5e594c126 Mon Sep 17 00:00:00 2001
+From 231031bd01cabca6ff6eb2b8588fa2fd974f2387 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 08:28:21 -0500
 Subject: [PATCH] Implement configurable villager brain ticks