Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions

View File

@@ -1,15 +1,15 @@
--- a/net/minecraft/server/PathfinderGoalBreakDoor.java
+++ b/net/minecraft/server/PathfinderGoalBreakDoor.java
@@ -44,6 +44,12 @@
@@ -66,6 +66,12 @@
}
if (this.d == 240 && this.a.world.getDifficulty() == EnumDifficulty.HARD) {
if (this.a == this.f() && this.a(this.entity.world.getDifficulty())) {
+ // CraftBukkit start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreakDoorEvent(this.a, this.b.getX(), this.b.getY(), this.b.getZ()).isCancelled()) {
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreakDoorEvent(this.entity, this.door).isCancelled()) {
+ this.c();
+ return;
+ }
+ // CraftBukkit end
this.a.world.setAir(this.b);
this.a.world.triggerEffect(1021, this.b, 0);
this.a.world.triggerEffect(2001, this.b, Block.getCombinedId(this.a.world.getType(this.b)));
this.entity.world.a(this.door, false);
this.entity.world.triggerEffect(1021, this.door, 0);
this.entity.world.triggerEffect(2001, this.door, Block.getCombinedId(this.entity.world.getType(this.door)));