2020-04-02 23:07:06 +02:00
|
|
|
From 54f39c3f4e87f62020db7521485cba949b5364d9 Mon Sep 17 00:00:00 2001
|
2018-07-21 09:00:31 +02: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
|
2020-04-02 23:07:06 +02:00
|
|
|
index 92dac35ec4..bd524a35bb 100644
|
2018-07-21 09:00:31 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/ItemFireworks.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/ItemFireworks.java
|
2019-12-12 00:43:22 +01:00
|
|
|
@@ -36,11 +36,16 @@ public class ItemFireworks extends Item {
|
2019-04-30 03:20:24 +02:00
|
|
|
// Paper start
|
|
|
|
final EntityFireworks entityfireworks = new EntityFireworks(world, itemstack, entityhuman);
|
|
|
|
entityfireworks.spawningEntity = entityhuman.getUniqueID();
|
2018-07-21 09:00:31 +02:00
|
|
|
- world.addEntity(entityfireworks);
|
2019-04-30 03:20:24 +02:00
|
|
|
- // Paper end
|
2018-07-21 09:00:31 +02: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 03:20:24 +02:00
|
|
|
+ // Paper end
|
2018-07-21 09:00:31 +02:00
|
|
|
}
|
|
|
|
|
2020-01-22 03:02:07 +01:00
|
|
|
return InteractionResultWrapper.success(entityhuman.b(enumhand));
|
2018-07-21 09:00:31 +02:00
|
|
|
--
|
2020-03-15 21:03:36 +01:00
|
|
|
2.25.1
|
2018-07-21 09:00:31 +02:00
|
|
|
|