summaryrefslogtreecommitdiffstats
path: root/nms-patches/MobEffectList.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/MobEffectList.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/MobEffectList.patch')
-rw-r--r--nms-patches/MobEffectList.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/nms-patches/MobEffectList.patch b/nms-patches/MobEffectList.patch
index ea421e5b..cfe1bc3b 100644
--- a/nms-patches/MobEffectList.patch
+++ b/nms-patches/MobEffectList.patch
@@ -53,8 +53,8 @@
+ ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutUpdateHealth(((EntityPlayer) entityhuman).getBukkitEntity().getScaledHealth(), entityhuman.getFoodData().foodLevel, entityhuman.getFoodData().saturationLevel));
+ // CraftBukkit end
}
- } else if ((this != MobEffects.HEAL || entityliving.ca()) && (this != MobEffects.HARM || !entityliving.ca())) {
- if (this == MobEffects.HARM && !entityliving.ca() || this == MobEffects.HEAL && entityliving.ca()) {
+ } else if ((this != MobEffects.HEAL || entityliving.cc()) && (this != MobEffects.HARM || !entityliving.cc())) {
+ if (this == MobEffects.HARM && !entityliving.cc() || this == MobEffects.HEAL && entityliving.cc()) {
entityliving.damageEntity(DamageSource.MAGIC, (float) (6 << i));
}
} else {