From e529e5056a0fbf901274667a4b5b727663e1e0de Mon Sep 17 00:00:00 2001
From: Villagers654 <110007851+villagers654@users.noreply.github.com>
Date: Sun, 12 Jan 2025 18:12:24 -0800
Subject: [PATCH] Fire EntityTeleportHinderedEvent when attempting to teleport 
 a player with passengers

---
 ...ortHinderedEvent-when-attempting-to-.patch | 19 -------------------
 ...0005-Add-EntityTeleportHinderedEvent.patch | 12 ++++++++++--
 2 files changed, 10 insertions(+), 21 deletions(-)
 delete mode 100644 patches/server/0290-Fire-EntityTeleportHinderedEvent-when-attempting-to-.patch

diff --git a/patches/server/0290-Fire-EntityTeleportHinderedEvent-when-attempting-to-.patch b/patches/server/0290-Fire-EntityTeleportHinderedEvent-when-attempting-to-.patch
deleted file mode 100644
index eb80c8468..000000000
--- a/patches/server/0290-Fire-EntityTeleportHinderedEvent-when-attempting-to-.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Villagers654 <110007851+Villagers654@users.noreply.github.com>
-Date: Mon, 22 Jul 2024 21:03:09 -0400
-Subject: [PATCH] Fire EntityTeleportHinderedEvent when attempting to teleport
- a player with passengers
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index df6fc6e6f4d1587dad704f609a854c5d996cf358..c2df3c38f58d8dcb5e3d62077655af56a3bffd65 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1471,6 +1471,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         }
- 
-         if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
-+            if (!new org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent(entity.getBukkitEntity(), org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent.Reason.IS_VEHICLE, cause).callEvent()) // Purpur start
-             return false;
-         }
- 
diff --git a/purpur-server/paper-patches/features/0005-Add-EntityTeleportHinderedEvent.patch b/purpur-server/paper-patches/features/0005-Add-EntityTeleportHinderedEvent.patch
index 22cdeb341..3ba73b231 100644
--- a/purpur-server/paper-patches/features/0005-Add-EntityTeleportHinderedEvent.patch
+++ b/purpur-server/paper-patches/features/0005-Add-EntityTeleportHinderedEvent.patch
@@ -29,14 +29,22 @@ index 48a2800004c8d5be6b672af849c7a93658e24d7a..f6c8a08fd4f0329357156085348d6b91
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b61e994e90f9ccc3e24cb916dd83a0af46ecf39f..bd0df2ae65e83dd74051d45dde8330af32c4dfe5 100644
+index b61e994e90f9ccc3e24cb916dd83a0af46ecf39f..614ebecdfe5838af5b2bf4a2d9f7ba26698a00f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1449,6 +1449,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper start - Teleport passenger API
          // Don't allow teleporting between worlds while keeping passengers
          if (ignorePassengers && entity.isVehicle() && location.getWorld() != this.getWorld()) {
-+            if (!new org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent(entity.getBukkitEntity(), org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent.Reason.IS_VEHICLE, cause).callEvent()) // Purpur start - Add EntityTeleportHinderedEvent
++            if (!new org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent(entity.getBukkitEntity(), org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent.Reason.IS_VEHICLE, cause).callEvent()) // Purpur - Add EntityTeleportHinderedEvent
+             return false;
+         }
+ 
+@@ -1470,6 +1471,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+         }
+ 
+         if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
++            if (!new org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent(entity.getBukkitEntity(), org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent.Reason.IS_VEHICLE, cause).callEvent()) // Purpur - Add EntityTeleportHinderedEvent
              return false;
          }