From f52665348e3cf0e4896c9eb32c0e3c855a6d92e2 Mon Sep 17 00:00:00 2001 From: fullwall Date: Mon, 9 Jan 2012 15:51:32 +0800 Subject: [Bleeding] Added Potions API. Fixes BUKKIT-389 --- src/main/java/net/minecraft/server/EntityLiving.java | 2 +- src/main/java/net/minecraft/server/MobEffectList.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/main/java/net/minecraft') diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index d19bc0af..360605f4 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -63,7 +63,7 @@ public abstract class EntityLiving extends Entity { protected EntityLiving lastDamager = null; public int aJ = 0; public int aK = 0; - protected HashMap effects = new HashMap(); + public HashMap effects = new HashMap(); // CraftBukkit - protected -> public private boolean b = true; private int c; private ControllerLook lookController; diff --git a/src/main/java/net/minecraft/server/MobEffectList.java b/src/main/java/net/minecraft/server/MobEffectList.java index 4d178290..ae27a5ac 100644 --- a/src/main/java/net/minecraft/server/MobEffectList.java +++ b/src/main/java/net/minecraft/server/MobEffectList.java @@ -2,7 +2,9 @@ package net.minecraft.server; // CraftBukkit start import org.bukkit.Bukkit; +import org.bukkit.potion.PotionEffectType; import org.bukkit.craftbukkit.event.CraftEventFactory; +import org.bukkit.craftbukkit.potion.CraftPotionEffectType; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; @@ -62,6 +64,8 @@ public class MobEffectList { } this.N = j; + + PotionEffectType.registerPotionEffectType(new CraftPotionEffectType(this)); // CraftBukkit } protected MobEffectList a(int i, int j) { -- cgit v1.2.3