mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-05 22:45:08 +01:00
35 lines
2 KiB
Diff
35 lines
2 KiB
Diff
--- a/net/minecraft/server/EntitySilverfish.java
|
|
+++ b/net/minecraft/server/EntitySilverfish.java
|
|
@@ -18,7 +18,7 @@
|
|
this.goalSelector.a(3, this.b);
|
|
this.goalSelector.a(4, new PathfinderGoalMeleeAttack(this, 1.0D, false));
|
|
this.goalSelector.a(5, new EntitySilverfish.PathfinderGoalSilverfishHideInBlock(this));
|
|
- this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[0])).a());
|
|
+ this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[0])).a(new Class[0])); // CraftBukkit - decompile error
|
|
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
|
|
}
|
|
|
|
@@ -156,6 +156,11 @@
|
|
IBlockData iblockdata = world.getType(blockposition);
|
|
|
|
if (BlockMonsterEggs.h(iblockdata)) {
|
|
+ // CraftBukkit start
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.a, blockposition, BlockMonsterEggs.c(iblockdata.getBlock())).isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
world.setTypeAndData(blockposition, BlockMonsterEggs.c(iblockdata.getBlock()), 3);
|
|
this.a.doSpawnEffect();
|
|
this.a.die();
|
|
@@ -202,6 +207,11 @@
|
|
Block block = iblockdata.getBlock();
|
|
|
|
if (block instanceof BlockMonsterEggs) {
|
|
+ // CraftBukkit start
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.silverfish, blockposition1, Blocks.AIR.getBlockData()).isCancelled()) {
|
|
+ continue;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (world.getGameRules().getBoolean(GameRules.MOB_GRIEFING)) {
|
|
world.a(blockposition1, true, this.silverfish);
|
|
} else {
|