Upstream/Vault
1
0
Fork 0
mirror of https://github.com/MilkBowl/Vault.git synced 2025-02-18 21:32:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
mung3r 2013-01-03 11:17:39 -08:00
commit b2dbf74d78
5 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pom.xml
View File

@ -252,18 +252,18 @@
<systemPath>${project.basedir}/lib/Gringotts.jar</systemPath> <systemPath>${project.basedir}/lib/Gringotts.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gravypod.Dosh</groupId> <groupId>com.gravypod.Dosh</groupId>
<artifactId>Dosh</artifactId> <artifactId>Dosh</artifactId>
<version>1.0</version> <version>1.0</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${project.basedir}/lib/Dosh.jar</systemPath> <systemPath>${project.basedir}/lib/Dosh.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.zathrus_writer.commandsex</groupId> <groupId>com.github.zathrus_writer.commandsex</groupId>
<artifactId>CommandsEX</artifactId> <artifactId>CommandsEX</artifactId>
<version>1.98</version> <version>1.98</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${project.basedir}/lib/CommandsEX.jar</systemPath> <systemPath>${project.basedir}/lib/CommandsEX.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.omwah</groupId> <groupId>com.github.omwah</groupId>
@ -272,7 +272,7 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<sourceDirectory>src/</sourceDirectory> <sourceDirectory>src/</sourceDirectory>
<resources> <resources>
<resource> <resource>
<directory>${project.basedir}</directory> <directory>${project.basedir}</directory>

2
src/net/milkbowl/vault/Metrics.java
View File

@ -238,7 +238,7 @@ public class Metrics {
} }
// Ping the server in intervals // Ping the server in intervals
plugin.getServer().getScheduler().scheduleAsyncRepeatingTask(plugin, new Runnable() { plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() {
private boolean firstPost = true; private boolean firstPost = true;
public void run() { public void run() {
try { try {

11
src/net/milkbowl/vault/Vault.java
View File

@ -107,6 +107,7 @@ public class Vault extends JavaPlugin {
public void onDisable() { public void onDisable() {
// Remove all Service Registrations // Remove all Service Registrations
getServer().getServicesManager().unregisterAll(this); getServer().getServicesManager().unregisterAll(this);
Bukkit.getScheduler().cancelTasks(this);
} }
@Override @Override
@ -124,7 +125,7 @@ public class Vault extends JavaPlugin {
// Schedule to check the version every 30 minutes for an update. This is to update the most recent // Schedule to check the version every 30 minutes for an update. This is to update the most recent
// version so if an admin reconnects they will be warned about newer versions. // version so if an admin reconnects they will be warned about newer versions.
this.getServer().getScheduler().scheduleAsyncRepeatingTask(this, new Runnable() { this.getServer().getScheduler().runTaskTimerAsynchronously(this, new Runnable() {
@Override @Override
public void run() { public void run() {
@ -209,7 +210,7 @@ public class Vault extends JavaPlugin {
// Try to load Craftconomy // Try to load Craftconomy
hookEconomy("CraftConomy", Economy_Craftconomy.class, ServicePriority.Normal, "me.greatman.Craftconomy.Craftconomy"); hookEconomy("CraftConomy", Economy_Craftconomy.class, ServicePriority.Normal, "me.greatman.Craftconomy.Craftconomy");
// Try to load Craftconomy3 // Try to load Craftconomy3
hookEconomy("CraftConomy3", Economy_Craftconomy3.class, ServicePriority.Normal, "com.greatmancode.craftconomy3.BukkitLoader"); hookEconomy("CraftConomy3", Economy_Craftconomy3.class, ServicePriority.Normal, "com.greatmancode.craftconomy3.BukkitLoader");
@ -230,7 +231,7 @@ public class Vault extends JavaPlugin {
// Try to load Gringotts // Try to load Gringotts
hookEconomy("Gringotts", Economy_Gringotts.class, ServicePriority.Normal, "org.gestern.gringotts.Gringotts"); hookEconomy("Gringotts", Economy_Gringotts.class, ServicePriority.Normal, "org.gestern.gringotts.Gringotts");
// Try to load Essentials Economy // Try to load Essentials Economy
hookEconomy("Essentials Economy", Economy_Essentials.class, ServicePriority.Low, "com.earth2me.essentials.api.Economy", "com.earth2me.essentials.api.NoLoanPermittedException", "com.earth2me.essentials.api.UserDoesNotExistException"); hookEconomy("Essentials Economy", Economy_Essentials.class, ServicePriority.Low, "com.earth2me.essentials.api.Economy", "com.earth2me.essentials.api.NoLoanPermittedException", "com.earth2me.essentials.api.UserDoesNotExistException");
@ -251,10 +252,10 @@ public class Vault extends JavaPlugin {
// Try to load GoldIsMoney2 // Try to load GoldIsMoney2
hookEconomy("GoldIsMoney2", Economy_GoldIsMoney2.class, ServicePriority.Normal, "com.flobi.GoldIsMoney2.GoldIsMoney"); hookEconomy("GoldIsMoney2", Economy_GoldIsMoney2.class, ServicePriority.Normal, "com.flobi.GoldIsMoney2.GoldIsMoney");
// Try to load Dosh // Try to load Dosh
hookEconomy("Dosh", Economy_Dosh.class, ServicePriority.Normal, "com.gravypod.Dosh.Dosh"); hookEconomy("Dosh", Economy_Dosh.class, ServicePriority.Normal, "com.gravypod.Dosh.Dosh");
// Try to load CommandsEX Economy // Try to load CommandsEX Economy
hookEconomy("CommandsEX", Economy_CommandsEX.class, ServicePriority.Normal, "com.github.zathrus_writer.commandsex.api.EconomyAPI"); hookEconomy("CommandsEX", Economy_CommandsEX.class, ServicePriority.Normal, "com.github.zathrus_writer.commandsex.api.EconomyAPI");

4
src/net/milkbowl/vault/economy/plugins/Economy_MineConomy.java
View File

@ -100,11 +100,11 @@ public class Economy_MineConomy implements Economy {
} }
public String currencyNameSingular() { public String currencyNameSingular() {
return ""; return MCCom.getDefaultCurrency();
} }
public String currencyNamePlural() { public String currencyNamePlural() {
return ""; return MCCom.getDefaultCurrency();
} }
public double getBalance(String playerName) { public double getBalance(String playerName) {

4
src/net/milkbowl/vault/permission/plugins/Permission_bPermissions2.java
View File

@ -33,8 +33,8 @@ import org.bukkit.plugin.Plugin;
import de.bananaco.bpermissions.api.ApiLayer; import de.bananaco.bpermissions.api.ApiLayer;
import de.bananaco.bpermissions.api.World; import de.bananaco.bpermissions.api.World;
import de.bananaco.bpermissions.api.WorldManager; import de.bananaco.bpermissions.api.WorldManager;
import de.bananaco.bpermissions.api.util.Calculable; import de.bananaco.bpermissions.api.Calculable;
import de.bananaco.bpermissions.api.util.CalculableType; import de.bananaco.bpermissions.api.CalculableType;
public class Permission_bPermissions2 extends Permission { public class Permission_bPermissions2 extends Permission {