craftbukkit/nms-patches/net/minecraft/world/entity/monster/EntityCreeper.patch

97 lines
4.4 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/entity/monster/EntityCreeper.java
+++ b/net/minecraft/world/entity/monster/EntityCreeper.java
@@ -43,6 +43,13 @@
2021-03-16 09:00:00 +11:00
import net.minecraft.world.level.World;
2021-06-11 15:00:00 +10:00
import net.minecraft.world.level.gameevent.GameEvent;
2021-03-09 08:47:33 +11:00
2023-06-24 17:15:05 +10:00
+// CraftBukkit start;
2019-07-03 11:10:51 +10:00
+import org.bukkit.event.entity.CreatureSpawnEvent;
2023-06-24 17:15:05 +10:00
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.EntityRemoveEvent;
+import org.bukkit.event.entity.ExplosionPrimeEvent;
+// CraftBukkit end
2021-03-09 08:47:33 +11:00
+
2021-06-11 15:00:00 +10:00
public class EntityCreeper extends EntityMonster implements PowerableMob {
2021-11-22 09:00:00 +11:00
private static final DataWatcherObject<Integer> DATA_SWELL_DIR = DataWatcher.defineId(EntityCreeper.class, DataWatcherRegistry.INT);
@@ -53,6 +60,7 @@
public int maxSwell = 30;
public int explosionRadius = 3;
private int droppedSkulls;
2024-06-19 06:48:33 +10:00
+ public Entity entityIgniter; // CraftBukkit
public EntityCreeper(EntityTypes<? extends EntityCreeper> entitytypes, World world) {
super(entitytypes, world);
2024-04-24 01:15:00 +10:00
@@ -216,9 +224,20 @@
2019-04-23 12:00:00 +10:00
@Override
2021-11-22 09:00:00 +11:00
public void thunderHit(WorldServer worldserver, EntityLightning entitylightning) {
super.thunderHit(worldserver, entitylightning);
+ // CraftBukkit start
+ if (CraftEventFactory.callCreeperPowerEvent(this, entitylightning, org.bukkit.event.entity.CreeperPowerEvent.PowerCause.LIGHTNING).isCancelled()) {
+ return;
+ }
2023-06-24 17:15:05 +10:00
+ // CraftBukkit end
this.entityData.set(EntityCreeper.DATA_IS_POWERED, true);
}
2023-06-24 17:15:05 +10:00
+ // CraftBukkit start
2016-05-31 20:53:37 +10:00
+ public void setPowered(boolean powered) {
2021-06-11 15:00:00 +10:00
+ this.entityData.set(EntityCreeper.DATA_IS_POWERED, powered);
2016-05-31 20:53:37 +10:00
+ }
+ // CraftBukkit end
+
2019-04-23 12:00:00 +10:00
@Override
2021-11-22 09:00:00 +11:00
protected EnumInteractionResult mobInteract(EntityHuman entityhuman, EnumHand enumhand) {
ItemStack itemstack = entityhuman.getItemInHand(enumhand);
2024-04-24 01:15:00 +10:00
@@ -228,8 +247,9 @@
this.level().playSound(entityhuman, this.getX(), this.getY(), this.getZ(), soundeffect, this.getSoundSource(), 1.0F, this.random.nextFloat() * 0.4F + 0.8F);
if (!this.level().isClientSide) {
+ this.entityIgniter = entityhuman; // CraftBukkit
this.ignite();
- if (!itemstack.isDamageableItem()) {
2024-04-24 01:15:00 +10:00
+ if (itemstack.getMaxDamage() == 0) { // CraftBukkit - fix MC-264285: unbreakable flint and steels are completely consumed when igniting a creeper
itemstack.shrink(1);
} else {
2024-04-24 01:15:00 +10:00
itemstack.hurtAndBreak(1, entityhuman, getSlotForHand(enumhand));
2024-06-14 01:05:00 +10:00
@@ -246,11 +266,20 @@
2023-06-08 01:30:00 +10:00
if (!this.level().isClientSide) {
float f = this.isPowered() ? 2.0F : 1.0F;
2015-02-26 22:41:06 +00:00
2016-03-01 08:32:46 +11:00
+ // CraftBukkit start
2023-06-24 17:15:05 +10:00
+ ExplosionPrimeEvent event = CraftEventFactory.callExplosionPrimeEvent(this, this.explosionRadius * f, false);
+ if (!event.isCancelled()) {
2023-06-24 17:15:05 +10:00
+ // CraftBukkit end
this.dead = true;
- this.level().explode(this, this.getX(), this.getY(), this.getZ(), (float) this.explosionRadius * f, World.a.MOB);
+ this.level().explode(this, net.minecraft.world.level.Explosion.getDefaultDamageSource(this.level(), this).customCausingEntityDamager(this.entityIgniter), null, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), World.a.MOB); // CraftBukkit
2023-06-24 17:15:05 +10:00
this.spawnLingeringCloud();
2024-06-14 01:05:00 +10:00
this.triggerOnDeathMobEffects(Entity.RemovalReason.KILLED);
- this.discard();
+ this.discard(EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause
2023-06-24 17:15:05 +10:00
+ // CraftBukkit start
+ } else {
2021-06-11 15:00:00 +10:00
+ swell = 0;
+ }
+ // CraftBukkit end
}
}
2024-06-14 01:05:00 +10:00
@@ -261,6 +290,7 @@
if (!collection.isEmpty()) {
2023-06-08 01:30:00 +10:00
EntityAreaEffectCloud entityareaeffectcloud = new EntityAreaEffectCloud(this.level(), this.getX(), this.getY(), this.getZ());
2021-11-22 09:00:00 +11:00
+ entityareaeffectcloud.setOwner(this); // CraftBukkit
entityareaeffectcloud.setRadius(2.5F);
entityareaeffectcloud.setRadiusOnUse(-0.5F);
entityareaeffectcloud.setWaitTime(10);
2024-06-14 01:05:00 +10:00
@@ -274,7 +304,7 @@
2019-07-20 09:00:00 +10:00
entityareaeffectcloud.addEffect(new MobEffect(mobeffect));
2019-07-03 11:10:51 +10:00
}
2023-06-08 01:30:00 +10:00
- this.level().addFreshEntity(entityareaeffectcloud);
+ this.level().addFreshEntity(entityareaeffectcloud, CreatureSpawnEvent.SpawnReason.EXPLOSION); // CraftBukkit
2019-07-03 11:10:51 +10:00
}
}