--- 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 { private static final DataWatcherObject b = DataWatcher.a(EntityBat.class, DataWatcherRegistry.a); @@ -130,16 +132,24 @@ } if (this.world.a(EntityBat.c, (EntityLiving) this) != null) { + // CraftBukkit Start - Call BatToggleSleepEvent + if (CraftEventFactory.handleBatToggleSleepEvent(this, true)) { + this.setAsleep(false); + if (!flag) { + this.world.a((EntityHuman) null, 1025, blockposition, 0); + } + } + // CraftBukkit End + } + } else { + // CraftBukkit Start - Call BatToggleSleepEvent + if (CraftEventFactory.handleBatToggleSleepEvent(this, true)) { this.setAsleep(false); if (!flag) { this.world.a((EntityHuman) null, 1025, blockposition, 0); } } - } else { - this.setAsleep(false); - if (!flag) { - this.world.a((EntityHuman) null, 1025, blockposition, 0); - } + // CraftBukkit End - Call BatToggleSleepEvent } } else { if (this.d != null && (!this.world.isEmpty(this.d) || this.d.getY() < 1)) { @@ -163,7 +173,11 @@ this.aT = 0.5F; this.yaw += f1; if (this.random.nextInt(100) == 0 && this.world.getType(blockposition1).isOccluding(this.world, blockposition1)) { - this.setAsleep(true); + // CraftBukkit Start - Call BatToggleSleepEvent + if (CraftEventFactory.handleBatToggleSleepEvent(this, false)) { + this.setAsleep(true); + } + // CraftBukkit End } } @@ -193,7 +207,11 @@ return false; } else { if (!this.world.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);