RELEASE VERSION 3.3

JustBru00 · Jan 27, 2018 · 4cc6435 · 4cc6435
1 parent 6a757d6
commit 4cc6435
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/src/com/gmail/justbru00/epic/rename/utils/v3/Blacklists.java b/src/com/gmail/justbru00/epic/rename/utils/v3/Blacklists.java
@@ -27,8 +27,6 @@ public class Blacklists {
 	 */
 	public static boolean checkExistingName(Player p) {
 		Debug.send("[Blacklists#checkExistingName(Player)] Method called");
-		if (!p.hasPermission("epicrename.bypass.existingname")) {
-			// Player doesn't have the bypass permission
 
 			String itemName = RenameUtil.getInHand(p).getItemMeta().getDisplayName();
 			itemName = ChatColor.stripColor(itemName);
@@ -45,17 +43,19 @@ public static boolean checkExistingName(Player p) {
 
 					if (itemName.toLowerCase().contains(blacklistedString.toLowerCase())) {			
 						Debug.send("[Blacklists#checkExistingName(Player)] Name contained '" + blacklistedString + "'");
+
+						if (p.hasPermission("epicrename.bypass.existingname")) {
+							// Player has bypass permission
+							Debug.send("[Blacklists#checkExistingName(Player)] Player had the epicrename.bypass.existingname permission.");
+							Messager.msgPlayer(Main.getMsgFromConfig("blacklists.existingname.bypass"), p);
+							return true;	
+						} 							
+
 						return false;						
 					} 
 				}				
 			}
 
-		} else {
-			Debug.send("[Blacklists#checkExistingName(Player)] Player had the epicrename.bypass.existingname permission.");
-			Messager.msgPlayer(Main.getMsgFromConfig("blacklists.existingname.bypass"), p);
-			return true;
-		}
-
 		return true;
 	}
 
@@ -68,8 +68,7 @@ public static boolean checkExistingName(Player p) {
 	 */
 	public static boolean checkExistingLore(Player p) {
 		Debug.send("[Blacklists#checkExistingLore(Player)] Method called");
-		if (!p.hasPermission("epicrename.bypass.existinglore")) {
-			// Player doesn't have the bypass permission
+
 
 			List<String> loreLines = RenameUtil.getInHand(p).getItemMeta().getLore();
 
@@ -88,17 +87,18 @@ public static boolean checkExistingLore(Player p) {
 
 						if (loreLine.toLowerCase().contains(blacklistedString.toLowerCase())) {
 							Debug.send("[Blacklists#checkExistingLore(Player)] Lore Line: '"+ loreLine +  "' contained '" + blacklistedString + "'");
+							if (p.hasPermission("epicrename.bypass.existinglore")) {
+								// Player has bypass permission
+								Debug.send("[Blacklists#checkExistingLore(Player)] Player had the epicrename.bypass.existinglore permission.");
+								Messager.msgPlayer(Main.getMsgFromConfig("blacklists.existinglore.bypass"), p);
+								return true;
+							} 								
+
 							return false;
 						}
 					}				
 				}
-			}
-
-		} else {
-			Debug.send("[Blacklists#checkExistingLore(Player)] Player had the epicrename.bypass.existinglore permission.");
-			Messager.msgPlayer(Main.getMsgFromConfig("blacklists.existinglore.bypass"), p);
-			return true;
-		}
+			}	
 
 		return true;
 	}

diff --git a/src/plugin.yml b/src/plugin.yml
@@ -1,6 +1,6 @@
 name: EpicRename
 main: com.gmail.justbru00.epic.rename.main.v3.Main
-version: 3.3-INDEV
+version: 3.3
 description: Renames items.
 author: Justin Brubaker
 softdepend: [Vault]