37 lines
2.1 KiB
Diff
37 lines
2.1 KiB
Diff
--- a/net/minecraft/world/entity/animal/EntityTurtle.java
|
|
+++ b/net/minecraft/world/entity/animal/EntityTurtle.java
|
|
@@ -265,7 +265,9 @@
|
|
WorldServer worldserver = (WorldServer) world;
|
|
|
|
if (worldserver.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
|
|
+ this.forceDrops = true; // CraftBukkit
|
|
this.spawnAtLocation(worldserver, Items.TURTLE_SCUTE, 1);
|
|
+ this.forceDrops = false; // CraftBukkit
|
|
}
|
|
}
|
|
}
|
|
@@ -294,7 +296,7 @@
|
|
|
|
@Override
|
|
public void thunderHit(WorldServer worldserver, EntityLightning entitylightning) {
|
|
- this.hurtServer(worldserver, this.damageSources().lightningBolt(), Float.MAX_VALUE);
|
|
+ this.hurtServer(worldserver, this.damageSources().lightningBolt().customEntityDamager(entitylightning), Float.MAX_VALUE); // CraftBukkit
|
|
}
|
|
|
|
@Override
|
|
@@ -544,12 +546,14 @@
|
|
} else if (this.turtle.layEggCounter > this.adjustedTickDelay(200)) {
|
|
World world = this.turtle.level();
|
|
|
|
+ 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))) { // CraftBukkit
|
|
world.playSound((Entity) 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
|
|
this.turtle.setHasEgg(false);
|
|
this.turtle.setLayingEgg(false);
|
|
this.turtle.setInLoveTime(600);
|