mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-18 12:48:53 +01:00
da9d110d5b
This patch does not appear to be doing anything useful, and may hide errors. Currently, the save logic does not run through this path either so it did not do anything. Additionally, properly implement support for handling RegionFileSizeException in Moonrise.
28 lines
1.4 KiB
Diff
28 lines
1.4 KiB
Diff
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
|
|
index 7cd929d4b9ab60a585c2316b949fce2a0e97e467..2b1f3e27ce5cecc94297c27debe5e3bd64c08967 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
@@ -259,6 +259,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
|
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
|
|
+ if (!event.callEvent() || event.getTo() == null) {
|
|
+ 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
|
|
|