OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-08 11:24:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-759: Add FireworkExplodeEvent.

Browse source
This commit is contained in:
DemonWav 2015-09-30 09:02:11 +10:00 committed by md_5
parent 8cc1683e83
commit d4e32cef0c
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nms-patches/EntityFireworks.patch
View file

@ -1 +1,11 @@
--- a/net/minecraft/server/EntityFireworks.java
+++ b/net/minecraft/server/EntityFireworks.java
@@ -78,7 +78,7 @@
}
if (!this.world.isClientSide && this.ticksFlown > this.expectedLifespan) {
- this.world.broadcastEntityEffect(this, (byte) 17);
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) this.world.broadcastEntityEffect(this, (byte) 17);
this.die();
}

7
src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View file

@ -34,6 +34,7 @@ import org.bukkit.craftbukkit.util.CraftMagicNumbers;
import org.bukkit.entity.Arrow; import org.bukkit.entity.Arrow;
import org.bukkit.entity.Creeper; import org.bukkit.entity.Creeper;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Firework;
import org.bukkit.entity.Horse; import org.bukkit.entity.Horse;
import org.bukkit.entity.LightningStrike; import org.bukkit.entity.LightningStrike;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
@ -946,4 +947,10 @@ public class CraftEventFactory {
entityHuman.world.getServer().getPluginManager().callEvent(event); entityHuman.world.getServer().getPluginManager().callEvent(event);
return (Cancellable) event; return (Cancellable) event;
} }
public static FireworkExplodeEvent callFireworkExplodeEvent(EntityFireworks firework) {
FireworkExplodeEvent event = new FireworkExplodeEvent((Firework) firework.getBukkitEntity());
firework.world.getServer().getPluginManager().callEvent(event);
return event;
}
} }