Upstream/Vault
1
0
Fork 0
mirror of https://github.com/MilkBowl/Vault.git synced 2024-11-27 13:07:23 +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

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

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

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

@ -107,6 +107,7 @@ public class Vault extends JavaPlugin {
public void onDisable() {
// Remove all Service Registrations
getServer().getServicesManager().unregisterAll(this);
Bukkit.getScheduler().cancelTasks(this);
}
@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
// 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
public void run() {

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() {
return "";
return MCCom.getDefaultCurrency();
}
public String currencyNamePlural() {
return "";
return MCCom.getDefaultCurrency();
}
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.World;
import de.bananaco.bpermissions.api.WorldManager;
import de.bananaco.bpermissions.api.util.Calculable;
import de.bananaco.bpermissions.api.util.CalculableType;
import de.bananaco.bpermissions.api.Calculable;
import de.bananaco.bpermissions.api.CalculableType;
public class Permission_bPermissions2 extends Permission {