Update to Minecraft 1.19

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2022-06-08 02:00:00 +10:00
parent 91d9aa9a89
commit 25f3b50f6b
332 changed files with 3628 additions and 2559 deletions

View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/world/item/ItemChorusFruit.java
+++ b/net/minecraft/world/item/ItemChorusFruit.java
@@ -34,7 +34,16 @@
entityliving.stopRiding();
}
@@ -39,7 +39,16 @@
Vec3D vec3d = entityliving.position();
- if (entityliving.randomTeleport(d3, d4, d5, true)) {
+ // CraftBukkit start - handle canceled status of teleport event
@@ -15,6 +15,6 @@
+
+ if (status.get()) {
+ // CraftBukkit end
world.gameEvent(GameEvent.TELEPORT, vec3d, GameEvent.a.of((Entity) entityliving));
SoundEffect soundeffect = entityliving instanceof EntityFox ? SoundEffects.FOX_TELEPORT : SoundEffects.CHORUS_FRUIT_TELEPORT;
world.playSound((EntityHuman) null, d0, d1, d2, soundeffect, SoundCategory.PLAYERS, 1.0F, 1.0F);