craftbukkit/nms-patches/net/minecraft/world/item/ItemChorusFruit.patch

21 lines
955 B
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/item/ItemChorusFruit.java
+++ b/net/minecraft/world/item/ItemChorusFruit.java
2024-04-24 01:15:00 +10:00
@@ -36,7 +36,16 @@
2022-06-08 02:00:00 +10:00
Vec3D vec3d = entityliving.position();
2023-12-06 03:40:00 +11:00
- if (entityliving.randomTeleport(d0, d1, d2, true)) {
+ // CraftBukkit start - handle canceled status of teleport event
2023-12-06 03:40:00 +11:00
+ java.util.Optional<Boolean> status = entityliving.randomTeleport(d0, d1, d2, true, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.CHORUS_FRUIT);
2016-11-17 12:41:03 +11:00
+
+ if (!status.isPresent()) {
+ // teleport event was canceled, no more tries
+ break;
+ }
+
+ if (status.get()) {
+ // CraftBukkit end
2024-04-24 01:15:00 +10:00
world.gameEvent((Holder) GameEvent.TELEPORT, vec3d, GameEvent.a.of((Entity) entityliving));
2023-12-06 03:40:00 +11:00
SoundEffect soundeffect;
SoundCategory soundcategory;