2023-11-19 02:05:34 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: booky10 <boooky10@gmail.com>
|
|
|
|
Date: Sun, 12 Nov 2023 05:09:47 +0100
|
|
|
|
Subject: [PATCH] Fix missing event call for entity teleport API
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
2024-10-25 21:24:15 +02:00
|
|
|
index 11a08ff211a9a32a825519ddb1736e02cf7f685e..7536ab5c22d97a074c08a95fff6bc756d61e387d 100644
|
2023-11-19 02:05:34 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
2024-10-24 12:11:32 +02:00
|
|
|
@@ -259,6 +259,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
2023-11-19 02:05:34 +01:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start - fix teleport event not being called
|
|
|
|
+ org.bukkit.event.entity.EntityTeleportEvent event = new org.bukkit.event.entity.EntityTeleportEvent(
|
|
|
|
+ this, this.getLocation(), location);
|
|
|
|
+ // cancelling the event is handled differently for players and entities,
|
|
|
|
+ // entities just stop teleporting, players will still teleport to the "from" location of the event
|
2023-12-26 20:22:41 +01:00
|
|
|
+ if (!event.callEvent() || event.getTo() == null) {
|
2023-11-19 02:05:34 +01:00
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ location = event.getTo();
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
// If this entity is riding another entity, we must dismount before teleporting.
|
|
|
|
if (dismount) this.entity.stopRiding(); // Paper - Teleport passenger API
|
|
|
|
|