summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntitySlime.java
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2012-12-26 19:07:47 -0600
committerfeildmaster <admin@feildmaster.com>2012-12-27 21:05:40 -0600
commit509e3d2a328273b08e3a203023b117ad120b31dd (patch)
tree5e73db383bf32f0a84c4a0cef13f2917c45d4d5a /src/main/java/net/minecraft/server/EntitySlime.java
parentb908c192bfafe568131a018d8a961b0e7f8e43ee (diff)
downloadcraftbukkit-509e3d2a328273b08e3a203023b117ad120b31dd.tar
craftbukkit-509e3d2a328273b08e3a203023b117ad120b31dd.tar.gz
craftbukkit-509e3d2a328273b08e3a203023b117ad120b31dd.tar.lz
craftbukkit-509e3d2a328273b08e3a203023b117ad120b31dd.tar.xz
craftbukkit-509e3d2a328273b08e3a203023b117ad120b31dd.zip
Update maxhealth for entities that have variable max health. Fixes BUKKIT-3308
Slimes and wolves have health that can change based on certain conditions. So we check if their max health should be updated, and if it has been customized in any way. We also scale the wolf's health for their tail
Diffstat (limited to 'src/main/java/net/minecraft/server/EntitySlime.java')
-rw-r--r--src/main/java/net/minecraft/server/EntitySlime.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
index 54e50d13..8be72498 100644
--- a/src/main/java/net/minecraft/server/EntitySlime.java
+++ b/src/main/java/net/minecraft/server/EntitySlime.java
@@ -26,10 +26,16 @@ public class EntitySlime extends EntityLiving implements IMonster {
// CraftBukkit - protected -> public
public void setSize(int i) {
+ boolean updateMaxHealth = this.getMaxHealth() == this.maxHealth; // CraftBukkit
this.datawatcher.watch(16, new Byte((byte) i));
this.a(0.6F * (float) i, 0.6F * (float) i);
this.setPosition(this.locX, this.locY, this.locZ);
- this.setHealth(this.getMaxHealth());
+ // CraftBukkit start
+ if (updateMaxHealth) {
+ this.maxHealth = this.getMaxHealth();
+ }
+ this.setHealth(this.maxHealth);
+ // CraftBukkit end
this.bd = i;
}