Fix HEALTH_CHANGE

FallenMoonNetwork · Mar 27, 2013 · e5f24c3 · e5f24c3
1 parent 057fcb8
commit e5f24c3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/OEntity.java b/src/OEntity.java
@@ -33,8 +33,8 @@ public abstract class OEntity {
     public boolean I;
     public boolean J;
     protected boolean K;
-    public boolean L; //CanaryMod: isdead variable
-    public boolean M;
+    public boolean L;
+    public boolean M; //CanaryMod: isdead variable
     public float N;
     public float O;
     public float P;

diff --git a/src/OEntityLiving.java b/src/OEntityLiving.java
@@ -613,10 +613,10 @@ public int aX() {
     }
 
     public void b(int i) {
-        this.aS = i;
         if (i > this.aW()) {
             i = this.aW();
         }
+        this.aS = i; // CanaryMod: fix mojang being dumbasses
     }
 
     public boolean a(ODamageSource odamagesource, int i) {

diff --git a/src/OEntityPlayerMP.java b/src/OEntityPlayerMP.java
@@ -181,13 +181,13 @@ public void g() {
             }
 
             // CanaryMod: Update the health
-            if (this.aX() != this.cm) {
+            if (this.aX() != this.cm && cm != -99999999) {
                 // updates your health when it is changed.
                 if (!etc.getInstance().isHealthEnabled()) {
-                    this.j(this.aW());
-                    this.L = false;
+                    super.b(this.aW());
+                    this.M = false;
                 } else if ((Boolean) manager.callHook(PluginLoader.Hook.HEALTH_CHANGE, getPlayer(), cm, this.aX())) {
-                    this.j(this.cm);
+                    super.b(this.cm);
                 }
             }
 
@@ -901,7 +901,7 @@ public boolean getColorEnabled() {
     }
 
     public int getViewDistance() {
-        return this.cq;
+        return this.cr;
     }
     // CanaryMod end
 }