craftbukkit/nms-patches/net/minecraft/world/entity/ambient/EntityBat.patch

68 lines
2.7 KiB
Diff
Raw Normal View History

2018-09-16 12:57:03 -04:00
--- a/net/minecraft/server/EntityBat.java
+++ b/net/minecraft/server/EntityBat.java
2021-03-09 08:47:33 +11:00
@@ -5,6 +5,8 @@
2019-06-21 20:00:00 +10:00
import java.util.Random;
2018-09-16 12:57:03 -04:00
import javax.annotation.Nullable;
2021-03-09 08:47:33 +11:00
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
+
2018-09-16 12:57:03 -04:00
public class EntityBat extends EntityAmbient {
2021-03-09 08:47:33 +11:00
private static final DataWatcherObject<Byte> b = DataWatcher.a(EntityBat.class, DataWatcherRegistry.a);
@@ -105,16 +107,24 @@
2018-09-16 12:57:03 -04:00
}
2019-04-23 12:00:00 +10:00
if (this.world.a(EntityBat.c, (EntityLiving) this) != null) {
2018-09-16 12:57:03 -04:00
+ // CraftBukkit Start - Call BatToggleSleepEvent
+ if (CraftEventFactory.handleBatToggleSleepEvent(this, true)) {
+ this.setAsleep(false);
2020-06-25 10:00:00 +10:00
+ if (!flag) {
+ this.world.a((EntityHuman) null, 1025, blockposition, 0);
+ }
2018-09-16 12:57:03 -04:00
+ }
+ // CraftBukkit End
+ }
+ } else {
+ // CraftBukkit Start - Call BatToggleSleepEvent
+ if (CraftEventFactory.handleBatToggleSleepEvent(this, true)) {
this.setAsleep(false);
2020-06-25 10:00:00 +10:00
if (!flag) {
this.world.a((EntityHuman) null, 1025, blockposition, 0);
}
2018-09-16 12:57:03 -04:00
}
- } else {
- this.setAsleep(false);
2020-06-25 10:00:00 +10:00
- if (!flag) {
- this.world.a((EntityHuman) null, 1025, blockposition, 0);
- }
2018-09-16 12:57:03 -04:00
+ // CraftBukkit End - Call BatToggleSleepEvent
}
} else {
2019-04-23 12:00:00 +10:00
if (this.d != null && (!this.world.isEmpty(this.d) || this.d.getY() < 1)) {
2021-03-09 08:47:33 +11:00
@@ -138,7 +148,11 @@
2020-08-12 07:00:00 +10:00
this.aT = 0.5F;
2018-09-16 12:57:03 -04:00
this.yaw += f1;
2019-04-23 12:00:00 +10:00
if (this.random.nextInt(100) == 0 && this.world.getType(blockposition1).isOccluding(this.world, blockposition1)) {
2018-09-16 12:57:03 -04:00
- this.setAsleep(true);
+ // CraftBukkit Start - Call BatToggleSleepEvent
+ if (CraftEventFactory.handleBatToggleSleepEvent(this, false)) {
+ this.setAsleep(true);
+ }
+ // CraftBukkit End
}
}
2021-03-09 08:47:33 +11:00
@@ -168,7 +182,11 @@
2018-09-16 12:57:03 -04:00
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);