mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-09 20:30:28 +01:00
27 lines
1.8 KiB
Diff
27 lines
1.8 KiB
Diff
|
--- /home/matt/mc-dev-private//net/minecraft/server/EntitySilverfish.java 2015-02-26 22:40:22.679608138 +0000
|
||
|
|
+++ src/main/java/net/minecraft/server/EntitySilverfish.java 2015-02-26 22:40:22.683608138 +0000
|
||
|
|
@@ -144,6 +144,11 @@
|
||
|
|
IBlockData iblockdata = world.getType(blockposition);
|
||
|
|
|
||
|
|
if (BlockMonsterEggs.d(iblockdata)) {
|
||
|
|
+ // CraftBukkit start
|
||
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.silverfish, blockposition.getX(), blockposition.getY(), blockposition.getZ(), Blocks.MONSTER_EGG, Block.getId(BlockMonsterEggs.getById(iblockdata.getBlock().toLegacyData(iblockdata)))).isCancelled()) {
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+ // CraftBukkit end
|
||
|
|
world.setTypeAndData(blockposition, Blocks.MONSTER_EGG.getBlockData().set(BlockMonsterEggs.VARIANT, BlockMonsterEggs.EnumMonsterEggVarient.a(iblockdata)), 3);
|
||
|
|
this.silverfish.y();
|
||
|
|
this.silverfish.die();
|
||
|
|
@@ -187,6 +192,11 @@
|
||
|
|
IBlockData iblockdata = world.getType(blockposition1);
|
||
|
|
|
||
|
|
if (iblockdata.getBlock() == Blocks.MONSTER_EGG) {
|
||
|
|
+ // CraftBukkit start
|
||
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.silverfish, blockposition1.getX(), blockposition1.getY(), blockposition1.getZ(), Blocks.AIR, 0).isCancelled()) {
|
||
|
|
+ continue;
|
||
|
|
+ }
|
||
|
|
+ // CraftBukkit end
|
||
|
|
if (world.getGameRules().getBoolean("mobGriefing")) {
|
||
|
|
world.setAir(blockposition1, true);
|
||
|
|
} else {
|