Update to Minecraft 1.15

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-12-11 09:00:00 +11:00
parent 1400103b2f
commit 0e142c7f03
293 changed files with 2875 additions and 2648 deletions

View File

@@ -12,13 +12,13 @@
@@ -160,6 +160,11 @@
IBlockData iblockdata = world.getType(blockposition);
if (BlockMonsterEggs.j(iblockdata)) {
if (BlockMonsterEggs.h(iblockdata)) {
+ // CraftBukkit start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.a, blockposition, BlockMonsterEggs.e(iblockdata.getBlock())).isCancelled()) {
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.a, blockposition, BlockMonsterEggs.d(iblockdata.getBlock())).isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
world.setTypeAndData(blockposition, BlockMonsterEggs.e(iblockdata.getBlock()), 3);
world.setTypeAndData(blockposition, BlockMonsterEggs.d(iblockdata.getBlock()), 3);
this.a.doSpawnEffect();
this.a.die();
@@ -206,6 +211,11 @@
@@ -31,5 +31,5 @@
+ }
+ // CraftBukkit end
if (world.getGameRules().getBoolean(GameRules.MOB_GRIEFING)) {
world.b(blockposition1, true);
world.a(blockposition1, true, this.silverfish);
} else {