2015-09-30 01:02:11 +02:00
|
|
|
--- a/net/minecraft/server/EntityFireworks.java
|
|
|
|
+++ b/net/minecraft/server/EntityFireworks.java
|
2019-12-10 23:00:00 +01:00
|
|
|
@@ -3,6 +3,7 @@
|
2016-12-22 10:26:27 +01:00
|
|
|
import java.util.Iterator;
|
|
|
|
import java.util.List;
|
2019-04-23 04:00:00 +02:00
|
|
|
import java.util.OptionalInt;
|
2016-12-22 10:26:27 +01:00
|
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
|
|
|
|
|
2019-04-23 04:00:00 +02:00
|
|
|
public class EntityFireworks extends Entity implements IProjectile {
|
2016-12-22 10:26:27 +01:00
|
|
|
|
2019-12-10 23:00:00 +01:00
|
|
|
@@ -130,7 +131,11 @@
|
2015-09-30 01:02:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!this.world.isClientSide && this.ticksFlown > this.expectedLifespan) {
|
2019-04-23 04:00:00 +02:00
|
|
|
- this.explode();
|
2016-12-20 21:00:00 +01:00
|
|
|
+ // CraftBukkit start
|
|
|
|
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) {
|
2019-04-23 04:00:00 +02:00
|
|
|
+ this.explode();
|
2016-12-20 21:00:00 +01:00
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
2015-09-30 01:02:11 +02:00
|
|
|
}
|
|
|
|
|
2019-04-23 04:00:00 +02:00
|
|
|
}
|
2019-12-10 23:00:00 +01:00
|
|
|
@@ -143,7 +148,11 @@
|
2019-08-26 10:58:28 +02:00
|
|
|
|
|
|
|
protected void a(MovingObjectPosition movingobjectposition) {
|
|
|
|
if (movingobjectposition.getType() == MovingObjectPosition.EnumMovingObjectType.ENTITY && !this.world.isClientSide) {
|
|
|
|
- this.explode();
|
|
|
|
+ // CraftBukkit start
|
|
|
|
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) {
|
|
|
|
+ this.explode();
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
2019-12-10 23:00:00 +01:00
|
|
|
} else if (this.w) {
|
2019-08-26 10:58:28 +02:00
|
|
|
BlockPosition blockposition;
|
|
|
|
|
2019-12-10 23:00:00 +01:00
|
|
|
@@ -155,7 +164,11 @@
|
2019-08-26 10:58:28 +02:00
|
|
|
|
|
|
|
this.world.getType(blockposition).a(this.world, blockposition, (Entity) this);
|
2019-12-10 23:00:00 +01:00
|
|
|
if (this.hasExplosions()) {
|
2019-08-26 10:58:28 +02:00
|
|
|
- this.explode();
|
|
|
|
+ // CraftBukkit start
|
|
|
|
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) {
|
|
|
|
+ this.explode();
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-10 23:00:00 +01:00
|
|
|
@@ -181,7 +194,9 @@
|
2016-12-22 10:26:27 +01:00
|
|
|
|
|
|
|
if (f > 0.0F) {
|
2019-04-23 04:00:00 +02:00
|
|
|
if (this.ridingEntity != null) {
|
2016-12-22 10:26:27 +01:00
|
|
|
+ CraftEventFactory.entityDamage = this; // CraftBukkit
|
2019-04-23 04:00:00 +02:00
|
|
|
this.ridingEntity.damageEntity(DamageSource.FIREWORKS, 5.0F + (float) (nbttaglist.size() * 2));
|
2016-12-22 10:26:27 +01:00
|
|
|
+ CraftEventFactory.entityDamage = null; // CraftBukkit
|
|
|
|
}
|
|
|
|
|
|
|
|
double d0 = 5.0D;
|
2019-12-10 23:00:00 +01:00
|
|
|
@@ -208,7 +223,9 @@
|
2016-12-23 12:32:40 +01:00
|
|
|
if (flag) {
|
|
|
|
float f1 = f * (float) Math.sqrt((5.0D - (double) this.g(entityliving)) / 5.0D);
|
|
|
|
|
|
|
|
+ CraftEventFactory.entityDamage = this; // CraftBukkit
|
2018-07-15 02:00:00 +02:00
|
|
|
entityliving.damageEntity(DamageSource.FIREWORKS, f1);
|
2016-12-23 12:32:40 +01:00
|
|
|
+ CraftEventFactory.entityDamage = null; // CraftBukkit
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|