From 7ec866f45824daae1735d541c39234e7bb5babc0 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Sun, 23 Jun 2013 09:27:36 +0200 Subject: [PATCH] This is 6.4.1_dev, Fix Vault NPE. --- plugin.yml | 2 +- src/com/massivecraft/mcore/money/MoneyMixinVault.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin.yml b/plugin.yml index 7f6cfe86..885ff89d 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ main: com.massivecraft.mcore.MCore name: mcore -version: 6.4.0 +version: 6.4.1_dev website: http://massivecraft.com/mcore authors: [Cayorion] description: §eMCore stands for MassiveCraft Core and is a plugin that contains libraries and features that other plugins make use of. §aCayorion §efrom the minecraft server §aMassiveCraft §eis the lead programmer. Feel free to visit us at §bhttp://massivecraft.com diff --git a/src/com/massivecraft/mcore/money/MoneyMixinVault.java b/src/com/massivecraft/mcore/money/MoneyMixinVault.java index b9b7feaf..c751320c 100644 --- a/src/com/massivecraft/mcore/money/MoneyMixinVault.java +++ b/src/com/massivecraft/mcore/money/MoneyMixinVault.java @@ -25,6 +25,7 @@ public class MoneyMixinVault extends MoneyMixinAbstract public void activate() { RegisteredServiceProvider rsp = Bukkit.getServicesManager().getRegistration(Economy.class); + if (rsp == null) return; this.economy = rsp.getProvider(); Money.mixin(this); }