--- a/net/minecraft/world/entity/ambient/EntityBat.java +++ b/net/minecraft/world/entity/ambient/EntityBat.java @@ -30,6 +30,8 @@ import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.phys.Vec3D; +import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit + public class EntityBat extends EntityAmbient { public static final float FLAP_DEGREES_PER_TICK = 74.48451F; @@ -138,16 +140,24 @@ } if (this.level.a(EntityBat.BAT_RESTING_TARGETING, (EntityLiving) this) != null) { + // CraftBukkit Start - Call BatToggleSleepEvent + if (CraftEventFactory.handleBatToggleSleepEvent(this, true)) { + this.setAsleep(false); + if (!flag) { + this.level.a((EntityHuman) null, 1025, blockposition, 0); + } + } + // CraftBukkit End + } + } else { + // CraftBukkit Start - Call BatToggleSleepEvent + if (CraftEventFactory.handleBatToggleSleepEvent(this, true)) { this.setAsleep(false); if (!flag) { this.level.a((EntityHuman) null, 1025, blockposition, 0); } } - } else { - this.setAsleep(false); - if (!flag) { - this.level.a((EntityHuman) null, 1025, blockposition, 0); - } + // CraftBukkit End - Call BatToggleSleepEvent } } else { if (this.targetPosition != null && (!this.level.isEmpty(this.targetPosition) || this.targetPosition.getY() <= this.level.getMinBuildHeight())) { @@ -171,7 +181,11 @@ this.zza = 0.5F; this.setYRot(this.getYRot() + f1); if (this.random.nextInt(100) == 0 && this.level.getType(blockposition1).isOccluding(this.level, blockposition1)) { - this.setAsleep(true); + // CraftBukkit Start - Call BatToggleSleepEvent + if (CraftEventFactory.handleBatToggleSleepEvent(this, false)) { + this.setAsleep(true); + } + // CraftBukkit End } } @@ -201,7 +215,11 @@ return false; } else { if (!this.level.isClientSide && this.isAsleep()) { - this.setAsleep(false); + // CraftBukkit Start - Call BatToggleSleepEvent + if (CraftEventFactory.handleBatToggleSleepEvent(this, true)) { + this.setAsleep(false); + } + // CraftBukkit End - Call BatToggleSleepEvent } return super.damageEntity(damagesource, f);