2019-06-25 19:18:50 +00:00
|
|
|
From cd0f0503a69a3bb87922c0f5505e17e1d5905917 Mon Sep 17 00:00:00 2001
|
2018-07-21 07:00:31 +00:00
|
|
|
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
|
2019-06-06 15:36:57 +00:00
|
|
|
index aea46ffae5..9e86ef4ce2 100644
|
2018-07-21 07:00:31 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/ItemFireworks.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/ItemFireworks.java
|
2019-04-30 01:20:24 +00:00
|
|
|
@@ -35,11 +35,16 @@ public class ItemFireworks extends Item {
|
|
|
|
// Paper start
|
|
|
|
final EntityFireworks entityfireworks = new EntityFireworks(world, itemstack, entityhuman);
|
|
|
|
entityfireworks.spawningEntity = entityhuman.getUniqueID();
|
2018-07-21 07:00:31 +00:00
|
|
|
- world.addEntity(entityfireworks);
|
2019-04-30 01:20:24 +00:00
|
|
|
- // Paper end
|
2018-07-21 07:00:31 +00:00
|
|
|
- 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();
|
|
|
|
}
|
2019-04-30 01:20:24 +00:00
|
|
|
+ // Paper end
|
2018-07-21 07:00:31 +00:00
|
|
|
}
|
|
|
|
|
2019-04-30 01:20:24 +00:00
|
|
|
return new InteractionResultWrapper<>(EnumInteractionResult.SUCCESS, entityhuman.b(enumhand));
|
2018-07-21 07:00:31 +00:00
|
|
|
--
|
2019-06-25 19:18:50 +00:00
|
|
|
2.22.0
|
2018-07-21 07:00:31 +00:00
|
|
|
|