2018-07-21 06:55:07 +02:00
|
|
|
--- a/net/minecraft/server/EntityTurtle.java
|
|
|
|
|
+++ b/net/minecraft/server/EntityTurtle.java
|
2018-07-24 14:22:56 +02:00
|
|
|
@@ -231,7 +231,9 @@
|
|
|
|
|
|
|
|
|
|
protected void l() {
|
|
|
|
|
super.l();
|
|
|
|
|
+ this.forceDrops = true; // CraftBukkit
|
|
|
|
|
this.a((IMaterial) Items.SCUTE, 1);
|
|
|
|
|
+ this.forceDrops = false; // CraftBukkit
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void a(float f, float f1, float f2) {
|
|
|
|
|
@@ -260,7 +262,9 @@
|
2018-07-21 06:55:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void onLightningStrike(EntityLightning entitylightning) {
|
|
|
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = entitylightning; // CraftBukkit
|
|
|
|
|
this.damageEntity(DamageSource.LIGHTNING, Float.MAX_VALUE);
|
|
|
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = null; // CraftBukkit
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void die(DamageSource damagesource) {
|
2018-08-16 12:27:16 +02:00
|
|
|
@@ -438,8 +442,12 @@
|
|
|
|
|
} else if (this.f.bK > 200) {
|
|
|
|
|
World world = this.f.world;
|
|
|
|
|
|
|
|
|
|
+ // CraftBukkit start
|
|
|
|
|
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.f, this.d.up(), Blocks.TURTLE_EGG.getBlockData().set(BlockTurtleEgg.b, Integer.valueOf(this.f.random.nextInt(4) + 1))).isCancelled()) {
|
|
|
|
|
world.a((EntityHuman) null, blockposition, SoundEffects.ENTITY_TURTLE_LAY_EGG, SoundCategory.BLOCKS, 0.3F, 0.9F + world.random.nextFloat() * 0.2F);
|
|
|
|
|
- world.setTypeAndData(this.d.up(), (IBlockData) Blocks.TURTLE_EGG.getBlockData().set(BlockTurtleEgg.b, Integer.valueOf(this.f.random.nextInt(4) + 1)), 3);
|
|
|
|
|
+ world.setTypeAndData(this.d.up(), (IBlockData) Blocks.TURTLE_EGG.getBlockData().set(BlockTurtleEgg.b, Integer.valueOf(this.f.random.nextInt(4) + 1)), 3);
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
this.f.s(false);
|
|
|
|
|
this.f.t(false);
|
|
|
|
|
this.f.e(600);
|
