Upstream/Vault
1
0
Fork 0
mirror of https://github.com/MilkBowl/Vault.git synced 2024-12-27 03:17:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #423 from greatman/master

Browse Source 
Craftconomy 3.1.4 update
This commit is contained in:
Nick Minkler 2013-06-15 09:00:34 -07:00
commit 751224437e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -238,7 +238,7 @@
<dependency> <dependency>
<groupId>com.greatmancode</groupId> <groupId>com.greatmancode</groupId>
<artifactId>craftconomy3</artifactId> <artifactId>craftconomy3</artifactId>
<version>3.1.3-SNAPSHOT</version> <version>3.1.4-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.crystalyx.bukkit.simplyperms</groupId> <groupId>net.crystalyx.bukkit.simplyperms</groupId>

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

@ -221,7 +221,7 @@ public class Vault extends JavaPlugin {
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.tools.interfaces.BukkitLoader");
// Try to load eWallet // Try to load eWallet
hookEconomy("eWallet", Economy_eWallet.class, ServicePriority.Normal, "me.ethan.eWallet.ECO"); hookEconomy("eWallet", Economy_eWallet.class, ServicePriority.Normal, "me.ethan.eWallet.ECO");

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

@ -32,12 +32,12 @@ import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.PluginEnableEvent; import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import com.greatmancode.craftconomy3.BukkitLoader;
import com.greatmancode.craftconomy3.Cause; import com.greatmancode.craftconomy3.Cause;
import com.greatmancode.craftconomy3.Common; import com.greatmancode.craftconomy3.Common;
import com.greatmancode.craftconomy3.account.Account; import com.greatmancode.craftconomy3.account.Account;
import com.greatmancode.craftconomy3.database.tables.AccountTable; import com.greatmancode.craftconomy3.database.tables.AccountTable;
import com.greatmancode.craftconomy3.groups.WorldGroupsManager; import com.greatmancode.craftconomy3.groups.WorldGroupsManager;
import com.greatmancode.craftconomy3.tools.interfaces.BukkitLoader;
public class Economy_Craftconomy3 implements Economy { public class Economy_Craftconomy3 implements Economy {
private static final Logger log = Logger.getLogger("Minecraft"); private static final Logger log = Logger.getLogger("Minecraft");
@ -71,7 +71,7 @@ public class Economy_Craftconomy3 implements Economy {
if (economy.economy == null) { if (economy.economy == null) {
Plugin ec = plugin.getServer().getPluginManager().getPlugin("Craftconomy3"); Plugin ec = plugin.getServer().getPluginManager().getPlugin("Craftconomy3");
if (ec != null && ec.getClass().getName().equals("com.greatmancode.craftconomy3.BukkitLoader")) { if (ec != null && ec.getClass().getName().equals("com.greatmancode.craftconomy3.tools.interfaces.BukkitLoader")) {
economy.economy = (BukkitLoader) ec; economy.economy = (BukkitLoader) ec;
log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name));
} }