Paper/nms-patches/MobEffectList.patch

--- /home/matt/mc-dev-private//net/minecraft/server/MobEffectList.java	2015-02-26 22:40:22.883608136 +0000
+++ src/main/java/net/minecraft/server/MobEffectList.java	2015-02-26 22:40:22.883608136 +0000
@@ -7,6 +7,11 @@
 import java.util.UUID;
 import java.util.Map.Entry;
 
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
+// CraftBukkit end
+
 public class MobEffectList {
 
     public static final MobEffectList[] byId = new MobEffectList[32];
@@ -64,6 +69,7 @@
         }
 
         this.L = j;
+        org.bukkit.potion.PotionEffectType.registerPotionEffectType(new org.bukkit.craftbukkit.potion.CraftPotionEffectType(this)); // CraftBukkit
     }
 
     public static MobEffectList b(String s) {
@@ -86,11 +92,11 @@
     public void tick(EntityLiving entityliving, int i) {
         if (this.id == MobEffectList.REGENERATION.id) {
             if (entityliving.getHealth() < entityliving.getMaxHealth()) {
-                entityliving.heal(1.0F);
+                entityliving.heal(1.0F, RegainReason.MAGIC_REGEN); // CraftBukkit
             }
         } else if (this.id == MobEffectList.POISON.id) {
             if (entityliving.getHealth() > 1.0F) {
-                entityliving.damageEntity(DamageSource.MAGIC, 1.0F);
+                entityliving.damageEntity(CraftEventFactory.POISON, 1.0F);  // CraftBukkit - DamageSource.MAGIC -> CraftEventFactory.POISON
             }
         } else if (this.id == MobEffectList.WITHER.id) {
             entityliving.damageEntity(DamageSource.WITHER, 1.0F);
@@ -98,14 +104,25 @@
             ((EntityHuman) entityliving).applyExhaustion(0.025F * (float) (i + 1));
         } else if (this.id == MobEffectList.SATURATION.id && entityliving instanceof EntityHuman) {
             if (!entityliving.world.isClientSide) {
-                ((EntityHuman) entityliving).getFoodData().eat(i + 1, 1.0F);
+                // CraftBukkit start
+                EntityHuman entityhuman = (EntityHuman) entityliving;
+                int oldFoodLevel = entityhuman.getFoodData().foodLevel;
+
+                org.bukkit.event.entity.FoodLevelChangeEvent event = CraftEventFactory.callFoodLevelChangeEvent(entityhuman, i + 1 + oldFoodLevel);
+
+                if (!event.isCancelled()) {
+                    entityhuman.getFoodData().eat(event.getFoodLevel() - oldFoodLevel, 1.0F);
+                }
+
+                ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutUpdateHealth(((EntityPlayer) entityhuman).getBukkitEntity().getScaledHealth(), entityhuman.getFoodData().foodLevel, entityhuman.getFoodData().saturationLevel));
+                // CraftBukkit end
             }
         } else if ((this.id != MobEffectList.HEAL.id || entityliving.bm()) && (this.id != MobEffectList.HARM.id || !entityliving.bm())) {
             if (this.id == MobEffectList.HARM.id && !entityliving.bm() || this.id == MobEffectList.HEAL.id && entityliving.bm()) {
                 entityliving.damageEntity(DamageSource.MAGIC, (float) (6 << i));
             }
         } else {
-            entityliving.heal((float) Math.max(4 << i, 0));
+            entityliving.heal((float) Math.max(4 << i, 0), RegainReason.MAGIC); // CraftBukkit
         }
 
     }
@@ -124,7 +141,7 @@
             }
         } else {
             j = (int) (d0 * (double) (4 << i) + 0.5D);
-            entityliving.heal((float) j);
+            entityliving.heal((float) j, RegainReason.MAGIC); // CraftBukkit
         }
 
     }