2018-07-29 02:50:56 +02:00
|
|
|
--- a/net/minecraft/server/BlockTurtleEgg.java
|
|
|
|
+++ b/net/minecraft/server/BlockTurtleEgg.java
|
2018-08-16 12:23:17 +02:00
|
|
|
@@ -2,6 +2,12 @@
|
|
|
|
|
2018-08-02 23:24:19 +02:00
|
|
|
import java.util.Random;
|
|
|
|
import javax.annotation.Nullable;
|
2018-08-16 12:23:17 +02:00
|
|
|
+import org.bukkit.craftbukkit.block.CraftBlock;
|
|
|
|
+
|
2018-08-02 23:24:19 +02:00
|
|
|
+// CraftBukkit start
|
|
|
|
+import org.bukkit.event.entity.EntityInteractEvent;
|
|
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
|
|
+// CraftBukkit end
|
2018-08-16 12:23:17 +02:00
|
|
|
|
2018-08-02 23:24:19 +02:00
|
|
|
public class BlockTurtleEgg extends Block {
|
|
|
|
|
2020-06-25 02:00:00 +02:00
|
|
|
@@ -36,6 +42,19 @@
|
|
|
|
IBlockData iblockdata = world.getType(blockposition);
|
|
|
|
|
|
|
|
if (iblockdata.a(Blocks.TURTLE_EGG)) {
|
|
|
|
+ // CraftBukkit start - Step on eggs
|
|
|
|
+ org.bukkit.event.Cancellable cancellable;
|
|
|
|
+ if (entity instanceof EntityHuman) {
|
|
|
|
+ cancellable = CraftEventFactory.callPlayerInteractEvent((EntityHuman) entity, org.bukkit.event.block.Action.PHYSICAL, blockposition, null, null, null);
|
|
|
|
+ } else {
|
|
|
|
+ cancellable = new EntityInteractEvent(entity.getBukkitEntity(), CraftBlock.at(world, blockposition));
|
|
|
|
+ world.getServer().getPluginManager().callEvent((EntityInteractEvent) cancellable);
|
|
|
|
+ }
|
2018-08-16 12:23:17 +02:00
|
|
|
+
|
2020-06-25 02:00:00 +02:00
|
|
|
+ if (cancellable.isCancelled()) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
|
|
|
this.a(world, blockposition, iblockdata);
|
|
|
|
}
|
2018-08-02 23:24:19 +02:00
|
|
|
}
|
2020-06-25 02:00:00 +02:00
|
|
|
@@ -62,9 +81,19 @@
|
2019-01-17 03:02:34 +01:00
|
|
|
int i = (Integer) iblockdata.get(BlockTurtleEgg.a);
|
|
|
|
|
|
|
|
if (i < 2) {
|
|
|
|
+ // CraftBukkit start - Call BlockGrowEvent
|
2019-12-10 23:00:00 +01:00
|
|
|
+ if (!CraftEventFactory.handleBlockGrowEvent(worldserver, blockposition, iblockdata.set(BlockTurtleEgg.a, i + 1), 2)) {
|
2019-01-17 03:02:34 +01:00
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
2019-12-10 23:00:00 +01:00
|
|
|
worldserver.playSound((EntityHuman) null, blockposition, SoundEffects.ENTITY_TURTLE_EGG_CRACK, SoundCategory.BLOCKS, 0.7F, 0.9F + random.nextFloat() * 0.2F);
|
|
|
|
- worldserver.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockTurtleEgg.a, i + 1), 2);
|
|
|
|
+ // worldserver.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockTurtleEgg.a, i + 1), 2); // CraftBukkit - handled above
|
2019-01-17 03:02:34 +01:00
|
|
|
} else {
|
|
|
|
+ // CraftBukkit start - Call BlockFadeEvent
|
2019-12-10 23:00:00 +01:00
|
|
|
+ if (CraftEventFactory.callBlockFadeEvent(worldserver, blockposition, Blocks.AIR.getBlockData()).isCancelled()) {
|
2019-01-17 03:02:34 +01:00
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
2019-12-10 23:00:00 +01:00
|
|
|
worldserver.playSound((EntityHuman) null, blockposition, SoundEffects.ENTITY_TURTLE_EGG_HATCH, SoundCategory.BLOCKS, 0.7F, 0.9F + random.nextFloat() * 0.2F);
|
|
|
|
worldserver.a(blockposition, false);
|
|
|
|
|
2020-06-25 02:00:00 +02:00
|
|
|
@@ -75,7 +104,7 @@
|
2019-12-10 23:00:00 +01:00
|
|
|
entityturtle.setAgeRaw(-24000);
|
2020-06-25 02:00:00 +02:00
|
|
|
entityturtle.setHomePos(blockposition);
|
2019-12-10 23:00:00 +01:00
|
|
|
entityturtle.setPositionRotation((double) blockposition.getX() + 0.3D + (double) j * 0.2D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.3D, 0.0F, 0.0F);
|
|
|
|
- worldserver.addEntity(entityturtle);
|
|
|
|
+ worldserver.addEntity(entityturtle, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.EGG); // CraftBukkit
|
2018-07-29 02:50:56 +02:00
|
|
|
}
|
|
|
|
}
|
2019-12-10 23:00:00 +01:00
|
|
|
}
|