diff options
| author | fullwall <fullwall@optusnet.com> | 2012-01-09 15:51:32 +0800 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-02-10 17:41:13 -0500 |
| commit | f52665348e3cf0e4896c9eb32c0e3c855a6d92e2 (patch) | |
| tree | dfeb0a427532a4348f75d272986dd90cadde4185 /src/main/java/net/minecraft/server | |
| parent | 63b9ed9ab4ddd0adc424147a1c30f4d7f3f93d41 (diff) | |
| download | craftbukkit-f52665348e3cf0e4896c9eb32c0e3c855a6d92e2.tar craftbukkit-f52665348e3cf0e4896c9eb32c0e3c855a6d92e2.tar.gz craftbukkit-f52665348e3cf0e4896c9eb32c0e3c855a6d92e2.tar.lz craftbukkit-f52665348e3cf0e4896c9eb32c0e3c855a6d92e2.tar.xz craftbukkit-f52665348e3cf0e4896c9eb32c0e3c855a6d92e2.zip | |
[Bleeding] Added Potions API. Fixes BUKKIT-389
Diffstat (limited to 'src/main/java/net/minecraft/server')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityLiving.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/MobEffectList.java | 4 |
2 files changed, 5 insertions, 1 deletions
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) { |