Upstream/Vault
1
0
Fork 0
mirror of https://github.com/MilkBowl/Vault.git synced 2024-11-23 19:16:31 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6 from MilkBowl/master

Browse Source 
sync
This commit is contained in:
Rodney Ramos 2012-12-13 18:46:14 -08:00
commit 47e923d2f0
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin.yml
View File

@ -1,6 +1,6 @@
name: Vault name: Vault
main: net.milkbowl.vault.Vault main: net.milkbowl.vault.Vault
version: 1.2.22-b${BUILD_NUMBER} version: 1.2.23-b${BUILD_NUMBER}
authors: [cereal, Sleaker, mung3r] authors: [cereal, Sleaker, mung3r]
website: http://dev.bukkit.org/server-mods/vault website: http://dev.bukkit.org/server-mods/vault
load: startup load: startup

4
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>net.milkbowl.vault</groupId> <groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId> <artifactId>Vault</artifactId>
<version>1.2.22-SNAPSHOT</version> <version>1.2.23-SNAPSHOT</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
@ -11,7 +11,7 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId> <artifactId>craftbukkit</artifactId>
<version>1.4.5-R0.2</version> <version>1.4.5-R0.3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.hydrox.bukkit.DroxPerms</groupId> <groupId>de.hydrox.bukkit.DroxPerms</groupId>

5
src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java
View File

@ -53,7 +53,7 @@ public class Economy_iConomy6 implements Economy {
if (economy == null) { if (economy == null) {
Plugin ec = plugin.getServer().getPluginManager().getPlugin("iConomy"); Plugin ec = plugin.getServer().getPluginManager().getPlugin("iConomy");
if (ec != null && ec.isEnabled() && ec.getClass().getName().equals("com.iCo6.iConomy")) { if (ec != null && ec.isEnabled() && ec.getClass().getName().equals("com.iCo6.iConomy")) {
String version = ec.getDescription().getVersion().split(".")[0]; String version = ec.getDescription().getVersion().split("\\.")[0];
name += version; name += version;
economy = (iConomy) ec; economy = (iConomy) ec;
accounts = new Accounts(); accounts = new Accounts();
@ -73,9 +73,8 @@ public class Economy_iConomy6 implements Economy {
public void onPluginEnable(PluginEnableEvent event) { public void onPluginEnable(PluginEnableEvent event) {
if (economy.economy == null) { if (economy.economy == null) {
Plugin ec = plugin.getServer().getPluginManager().getPlugin("iConomy"); Plugin ec = plugin.getServer().getPluginManager().getPlugin("iConomy");
if (ec != null && ec.isEnabled() && ec.getClass().getName().equals("com.iCo6.iConomy")) { if (ec != null && ec.isEnabled() && ec.getClass().getName().equals("com.iCo6.iConomy")) {
String version = ec.getDescription().getVersion().split(".")[0]; String version = ec.getDescription().getVersion().split("\\.")[0];
name += version; name += version;
economy.economy = (iConomy) ec; economy.economy = (iConomy) ec;
accounts = new Accounts(); accounts = new Accounts();