From be482c64f1be5967d481d841b8ac31f8753dc3e2 Mon Sep 17 00:00:00 2001 From: Sleaker Date: Wed, 12 Dec 2012 16:19:54 -0800 Subject: [PATCH 1/4] revert dynamic version. --- .../milkbowl/vault/economy/plugins/Economy_iConomy6.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java index d9f6d73..f96e96f 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java @@ -38,7 +38,7 @@ import com.iCo6.system.Holdings; public class Economy_iConomy6 implements Economy { private static final Logger log = Logger.getLogger("Minecraft"); - private String name = "iConomy "; + private final String name = "iConomy 6"; private Plugin plugin = null; protected iConomy economy = null; private Accounts accounts; @@ -53,8 +53,6 @@ public class Economy_iConomy6 implements Economy { if (economy == null) { Plugin ec = plugin.getServer().getPluginManager().getPlugin("iConomy"); if (ec != null && ec.isEnabled() && ec.getClass().getName().equals("com.iCo6.iConomy")) { - String version = ec.getDescription().getVersion().split(".")[0]; - name += version; economy = (iConomy) ec; accounts = new Accounts(); log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), name)); @@ -75,8 +73,6 @@ public class Economy_iConomy6 implements Economy { Plugin ec = plugin.getServer().getPluginManager().getPlugin("iConomy"); if (ec != null && ec.isEnabled() && ec.getClass().getName().equals("com.iCo6.iConomy")) { - String version = ec.getDescription().getVersion().split(".")[0]; - name += version; economy.economy = (iConomy) ec; accounts = new Accounts(); log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); From c351f78f623468907db1cf5bda33d68335187a80 Mon Sep 17 00:00:00 2001 From: Sleaker Date: Wed, 12 Dec 2012 23:39:13 -0800 Subject: [PATCH 2/4] fixed iCo version thing. --- .../milkbowl/vault/economy/plugins/Economy_iConomy6.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java index f96e96f..42a7bda 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java @@ -38,7 +38,7 @@ import com.iCo6.system.Holdings; public class Economy_iConomy6 implements Economy { private static final Logger log = Logger.getLogger("Minecraft"); - private final String name = "iConomy 6"; + private String name = "iConomy "; private Plugin plugin = null; protected iConomy economy = null; private Accounts accounts; @@ -53,6 +53,8 @@ public class Economy_iConomy6 implements Economy { if (economy == null) { Plugin ec = plugin.getServer().getPluginManager().getPlugin("iConomy"); if (ec != null && ec.isEnabled() && ec.getClass().getName().equals("com.iCo6.iConomy")) { + String version = ec.getDescription().getVersion().split("\\.")[0]; + name += version; economy = (iConomy) ec; accounts = new Accounts(); log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), name)); @@ -71,8 +73,9 @@ public class Economy_iConomy6 implements Economy { public void onPluginEnable(PluginEnableEvent event) { if (economy.economy == null) { Plugin ec = plugin.getServer().getPluginManager().getPlugin("iConomy"); - if (ec != null && ec.isEnabled() && ec.getClass().getName().equals("com.iCo6.iConomy")) { + String version = ec.getDescription().getVersion().split("\\.")[0]; + name += version; economy.economy = (iConomy) ec; accounts = new Accounts(); log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); From a970099eaae483b0d53b96b20d92d40a81ff5c8d Mon Sep 17 00:00:00 2001 From: Sleaker Date: Wed, 12 Dec 2012 23:43:26 -0800 Subject: [PATCH 3/4] version up --- plugin.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.yml b/plugin.yml index df208b6..72212ab 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ name: Vault main: net.milkbowl.vault.Vault -version: 1.2.22-b${BUILD_NUMBER} +version: 1.2.23-b${BUILD_NUMBER} authors: [cereal, Sleaker, mung3r] website: http://dev.bukkit.org/server-mods/vault load: startup diff --git a/pom.xml b/pom.xml index 5afa5cb..4262c27 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 net.milkbowl.vault Vault - 1.2.22-SNAPSHOT + 1.2.23-SNAPSHOT UTF-8 From 43cdabaeeb8f62a525b8793450ef0f185a0208f1 Mon Sep 17 00:00:00 2001 From: Sleaker Date: Thu, 13 Dec 2012 07:32:31 -0800 Subject: [PATCH 4/4] update pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4262c27..6394040 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.bukkit craftbukkit - 1.4.5-R0.2 + 1.4.5-R0.3-SNAPSHOT de.hydrox.bukkit.DroxPerms