status & reload fix

latest_version.json

@@ -1,6 +1,6 @@
 {
-  "name": "Marriage v2.0.4",
+  "name": "Marriage v2.0.5",
   "type": "release",
   "gameVersion": "1.8.8",
-  "downloadURL": "http://ci.lenis0012.com/job/Marriage/31/artifact/target/Marriage-Spigot-2.0.4.jar"
+  "downloadURL": "http://ci.lenis0012.com/job/Marriage/33/artifact/target/Marriage-Spigot-2.0.5.jar"
 }

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.lenis0012.bukkit</groupId>
     <artifactId>marriage2</artifactId>
-    <version>2.0.5-SNAPSHOT</version>
+    <version>2.0.5</version>
     <packaging>jar</packaging>
     <name>Marriage</name>
     <url>http://dev.bukkit.org/server-mods/marriage-reloaded/</url>

src/main/java/com/lenis0012/bukkit/marriage2/commands/CommandHelp.java

@@ -37,15 +37,15 @@ public class CommandHelp extends Command {
 				message.tooltip("Cost: " + marriage.dependencies().getEconomyService().format(command.getExecutionFee()));
 			}
 			message.send(sender);
-
-            String status = Message.SINGLE.toString();
-            if(player != null && player.hasMetadata("marriedTo")) {
-                String partner = player.getMetadata("marriedTo").get(0).asString();
-                status = String.format(Message.MARRIED_TO.toString(), partner);
-            }
-            reply(Message.STATUS, status);
 		}
-		
+
+		String status = Message.SINGLE.toString();
+		if(player != null && player.hasMetadata("marriedTo")) {
+			String partner = player.getMetadata("marriedTo").get(0).asString();
+			status = String.format(Message.MARRIED_TO.toString(), partner);
+		}
+		reply(Message.STATUS, status);
+		System.out.println(Message.STATUS);
 		reply("&2&m--------------------------------------------"); // Play around with the amount of dashes later
 	}
 }

src/main/java/com/lenis0012/bukkit/marriage2/config/Message.java

@@ -42,7 +42,7 @@ public enum Message {
 	MARRIED_TO("&fmarried to %s"),
 
 	// WORDS
-	STATUS("&aStatus: "),
+	STATUS("&aStatus: %s"),
 	SINGLE("&fsingle");
 	
 	private final String defaultMessage;

src/main/java/com/lenis0012/bukkit/marriage2/config/Permissions.java

@@ -94,4 +94,10 @@ public enum Permissions {
             perm.permission.addParent(values()[perm.parent].permission, true);
         }
     }
+
+    public static void unloadAll() {
+        for(Permissions perm : values()) {
+            Bukkit.getPluginManager().removePermission(perm.permission);
+        }
+    }
 }

src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageCore.java

@@ -65,11 +65,6 @@ public class MarriageCore extends MarriageBase {
 		}
 	}
 
-	@Register(name = "database", type = Register.Type.DISABLE)
-	public void saveDatabase() {
-		unloadAll();
-	}
-
 	@Register(name = "updater", type = Type.ENABLE, priority = 9)
 	public void loadUpdater() {
 		UpdaterFactory factory = new UpdaterFactory(plugin);
@@ -84,6 +79,13 @@ public class MarriageCore extends MarriageBase {
 		}
 	}
 
+	@Register(name = "database", type = Register.Type.DISABLE)
+	public void saveDatabase() {
+		unloadAll();
+		dataManager.close();
+		Permissions.unloadAll();
+	}
+
 	@Override
 	public MPlayer getMPlayer(UUID uuid) {
 		MarriagePlayer player = players.get(uuid);

src/main/java/com/lenis0012/bukkit/marriage2/listeners/DatabaseListener.java

@@ -78,7 +78,7 @@ public class DatabaseListener implements Listener {
         DataManager.getExecutorService().execute(new Runnable() {
             @Override
             public void run() {
-                final String partner = ListQuery.getName(core.getDataManager(), player.getUniqueId());
+                final String partner = ListQuery.getName(core.getDataManager(), mplayer.getMarriage().getOtherPlayer(player.getUniqueId()));
                 if(partner == null) {
                     return;
                 }

src/main/resources/changelog.json

@@ -1,15 +1,15 @@
 {
-  "version": "Marriage v2.0.4",
+  "version": "Marriage v2.0.5",
   "data":
   [
     [
       "---[ Changelog ]---",
       "",
-      "- Fixed status showing as raw text",
+      "- Add support for reload",
       "",
-      "- Added partner name to help command",
+      "- Fixed status in help command",
       "",
-      "Next update: Gift shop"
+      "- Added tag {partner} to chat format"
     ],
     [
       "====[ DONATE ]====",