diff --git a/latest_version.json b/latest_version.json index 5867b2a..9f70f80 100644 --- a/latest_version.json +++ b/latest_version.json @@ -1,6 +1,6 @@ { - "name": "Marriage v2.0.13", + "name": "Marriage v2.0.14", "type": "release", - "gameVersion": "1.10.2", - "downloadURL": "http://ci.lenis0012.com/job/Marriage/94/artifact/target/Marriage-Spigot-2.0.13.jar" + "gameVersion": "1.11", + "downloadURL": "http://ci.lenis0012.com/job/Marriage/97/artifact/target/Marriage-Spigot-2.0.14.jar" } diff --git a/pom.xml b/pom.xml index afd732a..977c095 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.lenis0012.bukkit marriage2 - 2.0.14-SNAPSHOT + 2.0.14 jar Marriage http://dev.bukkit.org/server-mods/marriage-reloaded/ @@ -33,13 +33,7 @@ org.spigotmc spigot-api - 1.10.2-R0.1-SNAPSHOT - provided - - - org.bukkit - bukkit - 1.9-R0.1-SNAPSHOT + 1.11-R0.1-SNAPSHOT provided diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/MPlayer.java b/src/main/java/com/lenis0012/bukkit/marriage2/MPlayer.java index 78fecec..5ed4253 100644 --- a/src/main/java/com/lenis0012/bukkit/marriage2/MPlayer.java +++ b/src/main/java/com/lenis0012/bukkit/marriage2/MPlayer.java @@ -44,9 +44,17 @@ public interface MPlayer { * Get current marriage of the player. * * @return Player's marriage, NULL if not married. + * @deprecated Use {@link #getFirstMarriage()} or {@link #getMarriage(UUID)} or {@link #getMarriages()} */ + @Deprecated MData getMarriage(); + MData getFirstMarriage(); + + MData getMarriage(UUID withPlayer); + + MData getMarriages(); + /** * Get the last name the player logged on with. * diff --git a/src/main/resources/changelog.json b/src/main/resources/changelog.json index 596d2cc..91b02da 100644 --- a/src/main/resources/changelog.json +++ b/src/main/resources/changelog.json @@ -5,13 +5,11 @@ [ "---[ Changelog ]---", "", - "- Added permission for colored PMs", + "- Compile for 1.11", "", - "- Added pvp toggle command", + "- Fix status formatting", "", - "- Added gender to chat (optional)", - "", - "- Added EXP bonus option" + "- Allow colors in message formats", ], [ "====[ DONATE ]====",