Iep! Damage.ENTITY should have an attacker :D

grum · grum · commit f617297aa345 · 2010-12-04T00:07:49.000+01:00
diff --git a/src/ka.java b/src/ka.java
@@ -310,15 +310,15 @@ public boolean a(ea paramea, int paramInt) {
                 return false;
             }
             // hMod: partial damage
-            if ((Boolean) etc.getLoader().callHook(PluginLoader.Hook.DAMAGE, PluginLoader.DamageType.ENTITY, attacker, defender, paramInt - bn)) {
+            if (attacker != null && (Boolean) etc.getLoader().callHook(PluginLoader.Hook.DAMAGE, PluginLoader.DamageType.ENTITY, attacker, defender, paramInt - bn)) {
                 return false;
             }
             c(paramInt - this.bn);
             this.bn = paramInt;
             i = 0;
         } else {
             // hMod: full damage
-            if ((Boolean) etc.getLoader().callHook(PluginLoader.Hook.DAMAGE, PluginLoader.DamageType.ENTITY, attacker, defender, paramInt)) {
+            if (attacker != null && (Boolean) etc.getLoader().callHook(PluginLoader.Hook.DAMAGE, PluginLoader.DamageType.ENTITY, attacker, defender, paramInt)) {
                 return false;
             }
             this.bn = paramInt;

Original file line number	Diff line number	Diff line change
`@@ -310,15 +310,15 @@ public boolean a(ea paramea, int paramInt) {`
`310`	`310`	`return false;`
`311`	`311`	`}`
`312`	`312`	`// hMod: partial damage`
`313`		`- if ((Boolean) etc.getLoader().callHook(PluginLoader.Hook.DAMAGE, PluginLoader.DamageType.ENTITY, attacker, defender, paramInt - bn)) {`
	`313`	`+ if (attacker != null && (Boolean) etc.getLoader().callHook(PluginLoader.Hook.DAMAGE, PluginLoader.DamageType.ENTITY, attacker, defender, paramInt - bn)) {`
`314`	`314`	`return false;`
`315`	`315`	`}`
`316`	`316`	`c(paramInt - this.bn);`
`317`	`317`	`this.bn = paramInt;`
`318`	`318`	`i = 0;`
`319`	`319`	`} else {`
`320`	`320`	`// hMod: full damage`
`321`		`- if ((Boolean) etc.getLoader().callHook(PluginLoader.Hook.DAMAGE, PluginLoader.DamageType.ENTITY, attacker, defender, paramInt)) {`
	`321`	`+ if (attacker != null && (Boolean) etc.getLoader().callHook(PluginLoader.Hook.DAMAGE, PluginLoader.DamageType.ENTITY, attacker, defender, paramInt)) {`
`322`	`322`	`return false;`
`323`	`323`	`}`
`324`	`324`	`this.bn = paramInt;`