craftbukkit/nms-patches/EntityFireworks.patch

71 lines
2.6 KiB
Diff
Raw Normal View History

2015-09-30 09:02:11 +10:00
--- a/net/minecraft/server/EntityFireworks.java
+++ b/net/minecraft/server/EntityFireworks.java
2021-03-09 08:47:33 +11:00
@@ -5,6 +5,8 @@
2019-04-23 12:00:00 +10:00
import java.util.OptionalInt;
2020-06-25 10:00:00 +10:00
import javax.annotation.Nullable;
2016-12-22 20:26:27 +11:00
2021-03-09 08:47:33 +11:00
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
+
2020-06-25 10:00:00 +10:00
public class EntityFireworks extends IProjectile {
2016-12-22 20:26:27 +11:00
2021-03-09 08:47:33 +11:00
public static final DataWatcherObject<ItemStack> FIREWORK_ITEM = DataWatcher.a(EntityFireworks.class, DataWatcherRegistry.g);
@@ -121,7 +123,11 @@
2015-09-30 09:02:11 +10:00
}
if (!this.world.isClientSide && this.ticksFlown > this.expectedLifespan) {
2019-04-23 12:00:00 +10:00
- this.explode();
2016-12-21 07:00:00 +11:00
+ // CraftBukkit start
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) {
2019-04-23 12:00:00 +10:00
+ this.explode();
2016-12-21 07:00:00 +11:00
+ }
+ // CraftBukkit end
2015-09-30 09:02:11 +10:00
}
2019-04-23 12:00:00 +10:00
}
2021-03-09 08:47:33 +11:00
@@ -136,7 +142,11 @@
2020-06-25 10:00:00 +10:00
protected void a(MovingObjectPositionEntity movingobjectpositionentity) {
super.a(movingobjectpositionentity);
if (!this.world.isClientSide) {
- this.explode();
+ // CraftBukkit start
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) {
+ this.explode();
+ }
+ // CraftBukkit end
2020-06-25 10:00:00 +10:00
}
}
2021-03-09 08:47:33 +11:00
@@ -146,7 +156,11 @@
2020-06-25 10:00:00 +10:00
this.world.getType(blockposition).a(this.world, blockposition, (Entity) this);
if (!this.world.s_() && this.hasExplosions()) {
- this.explode();
+ // CraftBukkit start
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) {
+ this.explode();
+ }
+ // CraftBukkit end
}
2020-06-25 10:00:00 +10:00
super.a(movingobjectpositionblock);
2021-03-09 08:47:33 +11:00
@@ -172,7 +186,9 @@
2016-12-22 20:26:27 +11:00
if (f > 0.0F) {
2019-04-23 12:00:00 +10:00
if (this.ridingEntity != null) {
2016-12-22 20:26:27 +11:00
+ CraftEventFactory.entityDamage = this; // CraftBukkit
2020-06-25 10:00:00 +10:00
this.ridingEntity.damageEntity(DamageSource.a(this, this.getShooter()), 5.0F + (float) (nbttaglist.size() * 2));
2016-12-22 20:26:27 +11:00
+ CraftEventFactory.entityDamage = null; // CraftBukkit
}
double d0 = 5.0D;
2021-03-09 08:47:33 +11:00
@@ -199,7 +215,9 @@
2016-12-23 22:32:40 +11:00
if (flag) {
2020-08-12 07:00:00 +10:00
float f1 = f * (float) Math.sqrt((5.0D - (double) this.g((Entity) entityliving)) / 5.0D);
2016-12-23 22:32:40 +11:00
+ CraftEventFactory.entityDamage = this; // CraftBukkit
2020-06-25 10:00:00 +10:00
entityliving.damageEntity(DamageSource.a(this, this.getShooter()), f1);
2016-12-23 22:32:40 +11:00
+ CraftEventFactory.entityDamage = null; // CraftBukkit
}
}
}