From ce768078b13d4aecbb4d3a4a5761de73dd8232dc Mon Sep 17 00:00:00 2001 From: Sleaker Date: Fri, 14 Dec 2012 19:21:03 -0800 Subject: [PATCH 1/2] fix privs thinking it's simplyperms. --- .../vault/permission/plugins/Permission_Privileges.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_Privileges.java b/src/net/milkbowl/vault/permission/plugins/Permission_Privileges.java index 55ab19b..65611d9 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_Privileges.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_Privileges.java @@ -44,7 +44,7 @@ public class Permission_Privileges extends Permission { @EventHandler(priority = EventPriority.MONITOR) public void onPluginEnable(PluginEnableEvent event) { if (permission.privs == null) { - Plugin perms = plugin.getServer().getPluginManager().getPlugin("SimplyPerms"); + Plugin perms = plugin.getServer().getPluginManager().getPlugin("Privileges"); if (perms != null) { if (perms.isEnabled()) { @@ -58,7 +58,7 @@ public class Permission_Privileges extends Permission { @EventHandler(priority = EventPriority.MONITOR) public void onPluginDisable(PluginDisableEvent event) { if (permission.privs != null) { - if (event.getPlugin().getDescription().getName().equals("SimplyPerms")) { + if (event.getPlugin().getDescription().getName().equals("Privileges")) { permission.privs = null; log.info(String.format("[%s][Permission] %s un-hooked.", plugin.getDescription().getName(), permission.name)); } From af7ac43e8c256a45ed07092acca3478e9f1f914a Mon Sep 17 00:00:00 2001 From: coaster3000 Date: Sun, 16 Dec 2012 15:34:22 -0500 Subject: [PATCH 2/2] Fixed compiler warnings on return statements of javadocs. Signed-off-by: coaster3000 --- src/net/milkbowl/vault/economy/Economy.java | 16 ++++++++-------- src/net/milkbowl/vault/item/Items.java | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/net/milkbowl/vault/economy/Economy.java b/src/net/milkbowl/vault/economy/Economy.java index d771aff..be115d7 100644 --- a/src/net/milkbowl/vault/economy/Economy.java +++ b/src/net/milkbowl/vault/economy/Economy.java @@ -98,7 +98,7 @@ public interface Economy { * * @param playerName * @param amount - * @return + * @return True if playerName has amount, False else wise */ public boolean has(String playerName, double amount); @@ -124,7 +124,7 @@ public interface Economy { * Creates a bank account with the specified name and the player as the owner * @param name * @param player - * @return + * @return EconomyResponse Object */ public EconomyResponse createBank(String name, String player); @@ -138,7 +138,7 @@ public interface Economy { /** * Returns the amount the bank has * @param name - * @return + * @return EconomyResponse Object */ public EconomyResponse bankBalance(String name); @@ -147,7 +147,7 @@ public interface Economy { * * @param name * @param amount - * @return + * @return EconomyResponse Object */ public EconomyResponse bankHas(String name, double amount); @@ -156,7 +156,7 @@ public interface Economy { * * @param name * @param amount - * @return + * @return EconomyResponse Object */ public EconomyResponse bankWithdraw(String name, double amount); @@ -165,7 +165,7 @@ public interface Economy { * * @param name * @param amount - * @return + * @return EconomyResponse Object */ public EconomyResponse bankDeposit(String name, double amount); @@ -173,7 +173,7 @@ public interface Economy { * Check if a player is the owner of a bank account * @param name * @param playerName - * @return + * @return EconomyResponse Object */ public EconomyResponse isBankOwner(String name, String playerName); @@ -181,7 +181,7 @@ public interface Economy { * Check if the player is a member of the bank account * @param name * @param playerName - * @return + * @return EconomyResponse Object */ public EconomyResponse isBankMember(String name, String playerName); diff --git a/src/net/milkbowl/vault/item/Items.java b/src/net/milkbowl/vault/item/Items.java index c5cc0d3..7bf790d 100644 --- a/src/net/milkbowl/vault/item/Items.java +++ b/src/net/milkbowl/vault/item/Items.java @@ -630,7 +630,7 @@ public class Items { * Single item search function, for when we only ever want to return 1 result * * @param searchString - * @return + * @return ItemInfo Object */ public static ItemInfo itemByName(String searchString) { ItemInfo matchedItem = null; @@ -706,7 +706,7 @@ public class Items { * Joins elements of a String array with the glue between them into a String. * @param array * @param glue - * @return + * @return Concacted Array combined with glue */ public static String join(String[] array, String glue) { String joined = null; @@ -729,7 +729,7 @@ public class Items { * Joins elements of a String array with the glue between them into a String. * @param list * @param glue - * @return + * @return Concacted Array combined with glue */ public static String join(List list, String glue) { String joined = null;