mirror of
https://github.com/MilkBowl/Vault.git
synced 2024-11-27 04:55:33 +01:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
b2dbf74d78
22
pom.xml
22
pom.xml
@ -252,18 +252,18 @@
|
||||
<systemPath>${project.basedir}/lib/Gringotts.jar</systemPath>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.gravypod.Dosh</groupId>
|
||||
<artifactId>Dosh</artifactId>
|
||||
<version>1.0</version>
|
||||
<scope>system</scope>
|
||||
<systemPath>${project.basedir}/lib/Dosh.jar</systemPath>
|
||||
<groupId>com.gravypod.Dosh</groupId>
|
||||
<artifactId>Dosh</artifactId>
|
||||
<version>1.0</version>
|
||||
<scope>system</scope>
|
||||
<systemPath>${project.basedir}/lib/Dosh.jar</systemPath>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.github.zathrus_writer.commandsex</groupId>
|
||||
<artifactId>CommandsEX</artifactId>
|
||||
<version>1.98</version>
|
||||
<scope>system</scope>
|
||||
<systemPath>${project.basedir}/lib/CommandsEX.jar</systemPath>
|
||||
<groupId>com.github.zathrus_writer.commandsex</groupId>
|
||||
<artifactId>CommandsEX</artifactId>
|
||||
<version>1.98</version>
|
||||
<scope>system</scope>
|
||||
<systemPath>${project.basedir}/lib/CommandsEX.jar</systemPath>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.github.omwah</groupId>
|
||||
@ -272,7 +272,7 @@
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<sourceDirectory>src/</sourceDirectory>
|
||||
<sourceDirectory>src/</sourceDirectory>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>${project.basedir}</directory>
|
||||
|
@ -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 {
|
||||
|
@ -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() {
|
||||
@ -209,7 +210,7 @@ public class Vault extends JavaPlugin {
|
||||
|
||||
// Try to load Craftconomy
|
||||
hookEconomy("CraftConomy", Economy_Craftconomy.class, ServicePriority.Normal, "me.greatman.Craftconomy.Craftconomy");
|
||||
|
||||
|
||||
// Try to load Craftconomy3
|
||||
hookEconomy("CraftConomy3", Economy_Craftconomy3.class, ServicePriority.Normal, "com.greatmancode.craftconomy3.BukkitLoader");
|
||||
|
||||
@ -230,7 +231,7 @@ public class Vault extends JavaPlugin {
|
||||
|
||||
// Try to load Gringotts
|
||||
hookEconomy("Gringotts", Economy_Gringotts.class, ServicePriority.Normal, "org.gestern.gringotts.Gringotts");
|
||||
|
||||
|
||||
// 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");
|
||||
|
||||
@ -251,10 +252,10 @@ public class Vault extends JavaPlugin {
|
||||
|
||||
// Try to load GoldIsMoney2
|
||||
hookEconomy("GoldIsMoney2", Economy_GoldIsMoney2.class, ServicePriority.Normal, "com.flobi.GoldIsMoney2.GoldIsMoney");
|
||||
|
||||
|
||||
// Try to load Dosh
|
||||
hookEconomy("Dosh", Economy_Dosh.class, ServicePriority.Normal, "com.gravypod.Dosh.Dosh");
|
||||
|
||||
|
||||
// Try to load CommandsEX Economy
|
||||
hookEconomy("CommandsEX", Economy_CommandsEX.class, ServicePriority.Normal, "com.github.zathrus_writer.commandsex.api.EconomyAPI");
|
||||
|
||||
|
@ -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) {
|
||||
|
@ -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 {
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user