Update to Minecraft 1.12-pre2

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2017-05-14 12:00:00 +10:00
parent b8446f770b
commit 40c8954e17
210 changed files with 2280 additions and 1974 deletions

View File

@@ -52,14 +52,14 @@
this.locX += this.motX;
@@ -150,6 +167,11 @@
} else {
this.ap();
this.av();
if (damagesource.getEntity() != null) {
+ // CraftBukkit start
+ if (CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
+ return false;
+ }
+ // CraftBukkit end
Vec3D vec3d = damagesource.getEntity().aB();
Vec3D vec3d = damagesource.getEntity().aH();
if (vec3d != null) {
@@ -163,6 +185,7 @@