diff --git a/src/main/java/noppes/npcs/DataAI.java b/src/main/java/noppes/npcs/DataAI.java index cc69972a6..0c8689122 100644 --- a/src/main/java/noppes/npcs/DataAI.java +++ b/src/main/java/noppes/npcs/DataAI.java @@ -256,8 +256,8 @@ public class DataAI { return npc.getDistanceSq(pos[0] + 0.5, pos[1], pos[2] + 0.5); } - public void setWalkingSpeed(int speed){ - this.moveSpeed = speed; + public void setWalkingSpeed(double speed){ + this.moveSpeed = (int)speed; npc.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(npc.getSpeed()); } diff --git a/src/main/java/noppes/npcs/DataStats.java b/src/main/java/noppes/npcs/DataStats.java index 80919713f..272760485 100644 --- a/src/main/java/noppes/npcs/DataStats.java +++ b/src/main/java/noppes/npcs/DataStats.java @@ -178,7 +178,7 @@ public class DataStats { public float getAttackStrength(){ return attackStrength; } - public void setAttackStrength(float strength){ + public void setAttackStrength(double strength){ attackStrength = (float)(Math.floor(strength)); npc.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(attackStrength); } diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java index aa251d93e..9a9083e42 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java @@ -26,6 +26,5 @@ public class GuiScriptAllNPCs extends GuiScriptInterface { public void close() { super.close(); - ScriptController.Instance.npcScripts.errored.clear(); } } diff --git a/src/main/java/noppes/npcs/controllers/data/NPCDataScript.java b/src/main/java/noppes/npcs/controllers/data/NPCDataScript.java index 15a1564c3..d9dcd2dbe 100644 --- a/src/main/java/noppes/npcs/controllers/data/NPCDataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/NPCDataScript.java @@ -25,7 +25,6 @@ public class NPCDataScript implements IScriptHandler { public long lastInited = -1L; public boolean enabled = false; private Map console = new TreeMap(); - public List errored = new ArrayList(); public NPCDataScript(EntityNPCInterface npc) { if(npc != null) { @@ -34,7 +33,6 @@ public class NPCDataScript implements IScriptHandler { } public void clear() { this.console = new TreeMap(); - this.errored = new ArrayList(); this.scripts = new ArrayList(); } public void readFromNBT(NBTTagCompound compound) { @@ -71,20 +69,19 @@ public class NPCDataScript implements IScriptHandler { } public boolean isEnabled() { - return CustomNpcs.GlobalNPCScripts && ScriptController.Instance.npcScripts.enabled && ScriptController.HasStart && (this.npc == null || !this.npc.worldObj.isRemote); + return CustomNpcs.GlobalNPCScripts && this.enabled && ScriptController.HasStart && this.scripts.size() > 0; } public boolean isClient() { return this.npc.isClientWorld(); } public boolean getEnabled() { - return ScriptController.Instance.npcScripts.enabled; + return this.enabled; } public void setEnabled(boolean bo) { - ScriptController.Instance.npcScripts.enabled = bo; this.enabled = bo; } public String getLanguage() { - return ScriptController.Instance.npcScripts.scriptLanguage; + return this.scriptLanguage; } public void setLanguage(String lang) { this.scriptLanguage = lang; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java index b11661818..0f3bd4c00 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java @@ -53,13 +53,47 @@ public class ScriptLivingBase extends ScriptEntity extends ScriptLiving imp /** * @return The melee strength */ - public float getMeleeStrength(){ + public double getMeleeStrength(){ return npc.stats.getAttackStrength(); } /** * @param strength The melee strength */ - public void setMeleeStrength(float strength){ + public void setMeleeStrength(double strength){ npc.stats.setAttackStrength(strength); } @@ -1007,14 +1007,14 @@ public class ScriptNpc extends ScriptLiving imp /** * @param resistance Knockback resistance (0-2) default is 1 */ - public void setKnockbackResistance(float resistance){ - npc.stats.resistances.knockback = ValueUtil.correctFloat(resistance, 0, 2); + public void setKnockbackResistance(double resistance){ + npc.stats.resistances.knockback = ValueUtil.correctFloat((float) resistance, 0, 2); } /** * @return Returns Knockback Resistance */ - public float getKnockbackResistance(){ + public double getKnockbackResistance(){ return npc.stats.resistances.knockback; } @@ -1141,11 +1141,11 @@ public class ScriptNpc extends ScriptLiving imp return this.npc.ai.hasFlyLimit; } - public void setSpeed(int speed) { + public void setSpeed(double speed) { npc.ai.setWalkingSpeed(speed); } - public int getSpeed() { + public double getSpeed() { return npc.ai.getWalkingSpeed(); }