diff --git a/pom.xml b/pom.xml index a4ef10c4..771069db 100644 --- a/pom.xml +++ b/pom.xml @@ -205,7 +205,7 @@ com.fernferret.allpay AllPay - 6 + 8 jar compile diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java index eec81bbe..80349b1c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java @@ -63,7 +63,7 @@ import java.util.logging.Logger; * The implementation of the Multiverse-{@link Core}. */ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core { - private static final int PROTOCOL = 13; + private static final int PROTOCOL = 14; // TODO: Investigate if this one is really needed to be static. // Doubt it. -- FernFerret private static Map teleportQueue = new HashMap(); @@ -859,7 +859,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core { /** * This method is currently used by other plugins. * It will be removed in 2.4 - * @return + * @return The Multiverse config. + * @deprecated This is deprecated. */ @Deprecated public static MultiverseCoreConfiguration getStaticConfig() { diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java index e7ad09bf..69f42143 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java @@ -64,7 +64,7 @@ public class InfoCommand extends MultiverseCommand { if (this.worldManager.isMVWorld(args.get(0))) { // then we have a world! worldName = args.get(0); - } else if(this.worldManager.getUnloadedWorlds().contains(args.get(0))){ + } else if (this.worldManager.getUnloadedWorlds().contains(args.get(0))) { sender.sendMessage("That world exists, but it is unloaded!"); sender.sendMessage(String.format("You can load it with: %s/mv load %s", ChatColor.AQUA, args.get(0))); return; diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/MVConfigMigrator.java b/src/main/java/com/onarandombox/MultiverseCore/configuration/MVConfigMigrator.java index 1a8dbe16..1e2ac130 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/MVConfigMigrator.java +++ b/src/main/java/com/onarandombox/MultiverseCore/configuration/MVConfigMigrator.java @@ -23,7 +23,8 @@ import java.util.logging.Level; */ /** - * @deprecated This isn't used any more, is it? + * This will be gone in 2.4. + * @deprecated This isn't used any more, is it? No. No it is not. */ @Deprecated public abstract class MVConfigMigrator { diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/MVPermissions.java b/src/main/java/com/onarandombox/MultiverseCore/utils/MVPermissions.java index 980febeb..6fca03b0 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/MVPermissions.java +++ b/src/main/java/com/onarandombox/MultiverseCore/utils/MVPermissions.java @@ -43,10 +43,6 @@ public class MVPermissions implements PermissionsInterface { * @return True if they should bypass restrictions. */ public boolean canIgnoreGameModeRestriction(Player p, MultiverseWorld w) { - if (p.hasPermission("mv.bypass.gamemode.*")) { - this.plugin.log(Level.FINER, "Player has mv.bypass.gamemode.* their gamemode is ignored!"); - return true; - } return p.hasPermission("mv.bypass.gamemode." + w.getName()); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/MVPlayerSession.java b/src/main/java/com/onarandombox/MultiverseCore/utils/MVPlayerSession.java index 5b772f9e..c1c10cbb 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/MVPlayerSession.java +++ b/src/main/java/com/onarandombox/MultiverseCore/utils/MVPlayerSession.java @@ -7,8 +7,6 @@ package com.onarandombox.MultiverseCore.utils; -import com.onarandombox.MultiverseCore.MultiverseCoreConfiguration; - import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig; import org.bukkit.entity.Player;