summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityFireball.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-06-08 18:00:00 +1000
committermd_5 <git@md-5.net>2017-06-08 18:00:00 +1000
commitbb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772 (patch)
treea8e03741d518f6448cf4c5410b194a4396fede5e /nms-patches/EntityFireball.patch
parentfe3ca95c764848be56e872e3de57c66cb07d7515 (diff)
downloadcraftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar
craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar.gz
craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar.lz
craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar.xz
craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.zip
Update to Minecraft 1.12
Diffstat (limited to 'nms-patches/EntityFireball.patch')
-rw-r--r--nms-patches/EntityFireball.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/nms-patches/EntityFireball.patch b/nms-patches/EntityFireball.patch
index 620ec367..e9e26fd1 100644
--- a/nms-patches/EntityFireball.patch
+++ b/nms-patches/EntityFireball.patch
@@ -52,14 +52,14 @@
this.locX += this.motX;
@@ -150,6 +167,11 @@
} else {
- this.av();
+ this.ax();
if (damagesource.getEntity() != null) {
+ // CraftBukkit start
+ if (CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
+ return false;
+ }
+ // CraftBukkit end
- Vec3D vec3d = damagesource.getEntity().aH();
+ Vec3D vec3d = damagesource.getEntity().aJ();
if (vec3d != null) {
@@ -163,6 +185,7 @@