craftbukkit/nms-patches/net/minecraft/world/entity/projectile/EntityWitherSkull.patch

52 lines
2.4 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/entity/projectile/EntityWitherSkull.java
+++ b/net/minecraft/world/entity/projectile/EntityWitherSkull.java
2024-06-14 01:05:00 +10:00
@@ -24,6 +24,11 @@
2021-03-16 09:00:00 +11:00
import net.minecraft.world.phys.MovingObjectPositionEntity;
2024-06-14 01:05:00 +10:00
import net.minecraft.world.phys.Vec3D;
2023-06-24 17:15:05 +10:00
+// CraftBukkit start
+import org.bukkit.event.entity.EntityRemoveEvent;
2023-06-24 17:15:05 +10:00
+import org.bukkit.event.entity.ExplosionPrimeEvent;
+// CraftBukkit end
+
public class EntityWitherSkull extends EntityFireball {
2021-11-22 09:00:00 +11:00
private static final DataWatcherObject<Boolean> DATA_DANGEROUS = DataWatcher.defineId(EntityWitherSkull.class, DataWatcherRegistry.BOOLEAN);
2024-06-14 01:05:00 +10:00
@@ -69,7 +74,7 @@
2020-06-25 10:00:00 +10:00
if (entity.isAlive()) {
2024-06-14 01:05:00 +10:00
EnchantmentManager.doPostAttackEffects(worldserver, entity, damagesource);
2020-06-25 10:00:00 +10:00
} else {
- entityliving.heal(5.0F);
+ entityliving.heal(5.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.WITHER); // CraftBukkit
}
2020-06-25 10:00:00 +10:00
}
} else {
2024-06-14 01:05:00 +10:00
@@ -86,7 +91,7 @@
2020-06-25 10:00:00 +10:00
}
2020-06-25 10:00:00 +10:00
if (b0 > 0) {
2023-03-15 03:30:00 +11:00
- entityliving.addEffect(new MobEffect(MobEffects.WITHER, 20 * b0, 1), this.getEffectSource());
+ entityliving.addEffect(new MobEffect(MobEffects.WITHER, 20 * b0, 1), this.getEffectSource(), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK); // CraftBukkit
}
}
2024-06-14 01:05:00 +10:00
@@ -97,8 +102,16 @@
2022-12-08 03:00:00 +11:00
protected void onHit(MovingObjectPosition movingobjectposition) {
super.onHit(movingobjectposition);
2023-06-08 01:30:00 +10:00
if (!this.level().isClientSide) {
- this.level().explode(this, this.getX(), this.getY(), this.getZ(), 1.0F, false, World.a.MOB);
- this.discard();
+ // CraftBukkit start
2023-06-08 01:30:00 +10:00
+ // this.level().explode(this, this.getX(), this.getY(), this.getZ(), 1.0F, false, World.a.MOB);
+ ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), 1.0F, false);
2023-06-08 01:30:00 +10:00
+ this.level().getCraftServer().getPluginManager().callEvent(event);
+
+ if (!event.isCancelled()) {
2023-06-08 01:30:00 +10:00
+ this.level().explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), World.a.MOB);
+ }
+ // CraftBukkit end
+ this.discard(EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
}
}