3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-22 06:20:06 +01:00
Paper/nms-patches/EntityFireworks.patch

77 Zeilen
3.1 KiB
Diff

2015-09-30 01:02:11 +02:00
--- a/net/minecraft/server/EntityFireworks.java
+++ b/net/minecraft/server/EntityFireworks.java
@@ -3,12 +3,13 @@
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
public static final DataWatcherObject<ItemStack> FIREWORK_ITEM = DataWatcher.a(EntityFireworks.class, DataWatcherRegistry.g);
private static final DataWatcherObject<OptionalInt> c = DataWatcher.a(EntityFireworks.class, DataWatcherRegistry.r);
- private static final DataWatcherObject<Boolean> d = DataWatcher.a(EntityFireworks.class, DataWatcherRegistry.i);
+ public static final DataWatcherObject<Boolean> d = DataWatcher.a(EntityFireworks.class, DataWatcherRegistry.i); // PAIL
private int ticksFlown;
public int expectedLifespan;
private EntityLiving ridingEntity;
2019-04-23 04:00:00 +02:00
@@ -133,7 +134,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
}
@@ -146,7 +151,11 @@
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
} else if (this.z) {
BlockPosition blockposition;
@@ -158,7 +167,11 @@
this.world.getType(blockposition).a(this.world, blockposition, (Entity) this);
if (this.l()) {
- this.explode();
+ // CraftBukkit start
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) {
+ this.explode();
+ }
+ // CraftBukkit end
}
}
@@ -184,7 +197,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;
@@ -211,7 +226,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
}
}
}