From d32561f32686fc492091971c46e5379803cf1dca Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Tue, 28 Oct 2014 21:07:31 +0100 Subject: [PATCH] Fixed #currentLevel --- src/org/rev317/min/Loader.java | 9 +++++---- src/org/rev317/min/accessors/Client.java | 2 +- src/org/rev317/min/api/methods/Skill.java | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/org/rev317/min/Loader.java b/src/org/rev317/min/Loader.java index ad9cb86..b87e736 100644 --- a/src/org/rev317/min/Loader.java +++ b/src/org/rev317/min/Loader.java @@ -26,7 +26,8 @@ import java.net.URL; */ @ServerManifest(author = "Everel & Paradox", name = "Server name here", type = Type.INJECTION, version = 2.1) public class Loader extends ServerProvider { - private HookFile hookFile = new HookFile(Context.getInstance().getServerProviderInfo().getExtendedHookFile(), HookFile.TYPE_XML); + //private HookFile hookFile = new HookFile(Context.getInstance().getServerProviderInfo().getExtendedHookFile(), HookFile.TYPE_XML); + //private HookFile hookFile = new HookFile(Context.getInstance().getServerProviderInfo().getHookFile(), HookFile.TYPE_XML); public static Client getClient() { return (Client) Context.getInstance().getClient(); @@ -70,8 +71,8 @@ public class Loader extends ServerProvider { super.injectHooks(); } catch (Exception e) { e.printStackTrace(); - this.hookFile = new HookFile(Context.getInstance().getServerProviderInfo().getHookFile(), HookFile.TYPE_XML); - super.injectHooks(); + //this.hookFile = new HookFile(Context.getInstance().getServerProviderInfo().getHookFile(), HookFile.TYPE_XML); + //super.injectHooks(); } } @@ -83,7 +84,7 @@ public class Loader extends ServerProvider { @Override public HookFile getHookFile() { - return this.hookFile; + return new HookFile(Context.getInstance().getServerProviderInfo().getHookFile(), HookFile.TYPE_XML); } public void unloadScript(Script script) { diff --git a/src/org/rev317/min/accessors/Client.java b/src/org/rev317/min/accessors/Client.java index 46f4179..e6cff3d 100644 --- a/src/org/rev317/min/accessors/Client.java +++ b/src/org/rev317/min/accessors/Client.java @@ -47,5 +47,5 @@ public interface Client { public void doAction(int i); - + public int[] getCurrentStats(); } diff --git a/src/org/rev317/min/api/methods/Skill.java b/src/org/rev317/min/api/methods/Skill.java index 288465d..3568463 100644 --- a/src/org/rev317/min/api/methods/Skill.java +++ b/src/org/rev317/min/api/methods/Skill.java @@ -56,8 +56,9 @@ public enum Skill { * @return the current skill level. Done by Bears */ public static final int getCurrentLevel(int index) { + return Loader.getClient().getCurrentStats()[index]; //return Loader.getClient().getCurrentStats()[index]; - return getRealLevel(index); //TODO fix this method, it invokes a method not in the client accessor. + //return getRealLevel(index); //TODO fix this method, it invokes a method not in the client accessor. } /**