mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-08 19:34:09 +01:00
65bc2541a3
By: md_5 <git@md-5.net>
20 lines
955 B
Diff
20 lines
955 B
Diff
--- a/net/minecraft/world/item/ItemChorusFruit.java
|
|
+++ b/net/minecraft/world/item/ItemChorusFruit.java
|
|
@@ -36,7 +36,16 @@
|
|
|
|
Vec3D vec3d = entityliving.position();
|
|
|
|
- if (entityliving.randomTeleport(d0, d1, d2, true)) {
|
|
+ // CraftBukkit start - handle canceled status of teleport event
|
|
+ java.util.Optional<Boolean> status = entityliving.randomTeleport(d0, d1, d2, true, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.CHORUS_FRUIT);
|
|
+
|
|
+ if (!status.isPresent()) {
|
|
+ // teleport event was canceled, no more tries
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ if (status.get()) {
|
|
+ // CraftBukkit end
|
|
world.gameEvent((Holder) GameEvent.TELEPORT, vec3d, GameEvent.a.of((Entity) entityliving));
|
|
SoundEffect soundeffect;
|
|
SoundCategory soundcategory;
|