mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-03 13:36:44 +01:00
2f782a6652
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:17543ecfSPIGOT-5035: Error Using Virtual Merchant GUI0fc6922bSPIGOT-5028: Villager#setVillagerExperience() doesn't workbdbdbe44SPIGOT-5024: Fox error - Unknown target reason
34 lines
1.9 KiB
Diff
34 lines
1.9 KiB
Diff
From 2ca9b69f16fed32a11b667af444ce8ec02ba7b4f Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 21 Jul 2018 01:59:59 -0500
|
|
Subject: [PATCH] PlayerElytraBoostEvent
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
|
|
index aea46ffae5..9e86ef4ce2 100644
|
|
--- a/src/main/java/net/minecraft/server/ItemFireworks.java
|
|
+++ b/src/main/java/net/minecraft/server/ItemFireworks.java
|
|
@@ -35,11 +35,16 @@ public class ItemFireworks extends Item {
|
|
// Paper start
|
|
final EntityFireworks entityfireworks = new EntityFireworks(world, itemstack, entityhuman);
|
|
entityfireworks.spawningEntity = entityhuman.getUniqueID();
|
|
- world.addEntity(entityfireworks);
|
|
- // Paper end
|
|
- if (!entityhuman.abilities.canInstantlyBuild) {
|
|
- itemstack.subtract(1);
|
|
+ // Paper start
|
|
+ com.destroystokyo.paper.event.player.PlayerElytraBoostEvent event = new com.destroystokyo.paper.event.player.PlayerElytraBoostEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Firework) entityfireworks.getBukkitEntity());
|
|
+ if (event.callEvent() && world.addEntity(entityfireworks)) {
|
|
+ if (event.shouldConsume() && !entityhuman.abilities.canInstantlyBuild) {
|
|
+ itemstack.subtract(1);
|
|
+ } else ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
|
+ } else if (entityhuman instanceof EntityPlayer) {
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
|
}
|
|
+ // Paper end
|
|
}
|
|
|
|
return new InteractionResultWrapper<>(EnumInteractionResult.SUCCESS, entityhuman.b(enumhand));
|
|
--
|
|
2.21.0
|
|
|