mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
9f0aa881d5
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@8dc76e7 [ci skip] Move back more PaperMC/Paper@4803421 Fix Player.setPlayerListOrder to send update to clients (#11729) PaperMC/Paper@b746d9d Add missing UPDATE_HAT and UPDATE_LIST_ORDER to some paper-added functions in ClientboundPlayerInfoUpdatePacket (#11731)
20 lines
1.1 KiB
Diff
20 lines
1.1 KiB
Diff
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 819323a17e17e4d07f6acafb37ce137204bfadce..029d6daa003f90999afa4e5070eabf6e0ada473a 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;
|
|
}
|
|
|