mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-10 03:52:45 +01:00
39 lines
2.2 KiB
Diff
39 lines
2.2 KiB
Diff
--- a/net/minecraft/world/entity/animal/EntityTurtle.java
|
|
+++ b/net/minecraft/world/entity/animal/EntityTurtle.java
|
|
@@ -308,7 +308,9 @@
|
|
protected void ageBoundaryReached() {
|
|
super.ageBoundaryReached();
|
|
if (!this.isBaby() && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
|
|
+ this.forceDrops = true; // CraftBukkit
|
|
this.spawnAtLocation(Items.SCUTE, 1);
|
|
+ this.forceDrops = false; // CraftBukkit
|
|
}
|
|
|
|
}
|
|
@@ -335,7 +337,9 @@
|
|
|
|
@Override
|
|
public void thunderHit(WorldServer worldserver, EntityLightning entitylightning) {
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = entitylightning; // CraftBukkit
|
|
this.hurt(this.damageSources().lightningBolt(), Float.MAX_VALUE);
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = null; // CraftBukkit
|
|
}
|
|
|
|
private static class e extends ControllerMove {
|
|
@@ -487,12 +491,16 @@
|
|
} else if (this.turtle.layEggCounter > this.adjustedTickDelay(200)) {
|
|
World world = this.turtle.level;
|
|
|
|
+ // CraftBukkit start
|
|
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.turtle, this.blockPos.above(), (IBlockData) Blocks.TURTLE_EGG.defaultBlockState().setValue(BlockTurtleEgg.EGGS, this.turtle.random.nextInt(4) + 1)).isCancelled()) {
|
|
world.playSound((EntityHuman) null, blockposition, SoundEffects.TURTLE_LAY_EGG, SoundCategory.BLOCKS, 0.3F, 0.9F + world.random.nextFloat() * 0.2F);
|
|
BlockPosition blockposition1 = this.blockPos.above();
|
|
IBlockData iblockdata = (IBlockData) Blocks.TURTLE_EGG.defaultBlockState().setValue(BlockTurtleEgg.EGGS, this.turtle.random.nextInt(4) + 1);
|
|
|
|
world.setBlock(blockposition1, iblockdata, 3);
|
|
world.gameEvent(GameEvent.BLOCK_PLACE, blockposition1, GameEvent.a.of(this.turtle, iblockdata));
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.turtle.setHasEgg(false);
|
|
this.turtle.setLayingEgg(false);
|
|
this.turtle.setInLoveTime(600);
|