Merge pull request #238 from mung3r/master

let's go!
This commit is contained in:
Rodney Ramos 2012-08-07 22:22:57 -07:00
commit a4a5427628
2 changed files with 3 additions and 3 deletions

View File

@ -142,7 +142,7 @@ public class Economy_AEco implements Economy {
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPluginDisable(PluginDisableEvent event) { public void onPluginDisable(PluginDisableEvent event) {
if (economy.economy != null) { if (economy.economy != null) {
if (event.getPlugin().getDescription().getName().equals("3co")) { if (event.getPlugin().getDescription().getName().equals("AEco")) {
economy.economy = null; economy.economy = null;
log.info(String.format("[%s][Economy] %s unhooked.", plugin.getDescription().getName(), economy.name)); log.info(String.format("[%s][Economy] %s unhooked.", plugin.getDescription().getName(), economy.name));
} }

View File

@ -61,7 +61,7 @@ public class Permission_Starburst extends Permission {
public void onPluginEnable(PluginEnableEvent event) { public void onPluginEnable(PluginEnableEvent event) {
if (perms == null) { if (perms == null) {
Plugin p = event.getPlugin(); Plugin p = event.getPlugin();
if (p.getDescription().getName().equals("bPermissions") && p.isEnabled()) { if (p.getDescription().getName().equals("Starburst") && p.isEnabled()) {
perms = (StarburstPlugin) p; perms = (StarburstPlugin) p;
log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name)); log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name));
} }
@ -71,7 +71,7 @@ public class Permission_Starburst extends Permission {
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPluginDisable(PluginDisableEvent event) { public void onPluginDisable(PluginDisableEvent event) {
if (perms != null) { if (perms != null) {
if (event.getPlugin().getDescription().getName().equals("bPermissions")) { if (event.getPlugin().getDescription().getName().equals("Starburst")) {
perms = null; perms = null;
log.info(String.format("[%s][Permission] %s un-hooked.", plugin.getDescription().getName(), name)); log.info(String.format("[%s][Permission] %s un-hooked.", plugin.getDescription().getName(), name));
} }