Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2025-02-13 11:01:57 +01:00
Code Issues Projects Releases Wiki Activity

Lots of cleanup prepping for 2.3AB

Browse Source
This commit is contained in:
Eric Stokes 2012-02-04 17:40:12 -07:00
parent 3ac4e55dc2
commit b66028e0e0
6 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -205,7 +205,7 @@
<dependency> <dependency>
<groupId>com.fernferret.allpay</groupId> <groupId>com.fernferret.allpay</groupId>
<artifactId>AllPay</artifactId> <artifactId>AllPay</artifactId>
<version>6</version> <version>8</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

5
src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
View File

@ -63,7 +63,7 @@ import java.util.logging.Logger;
* The implementation of the Multiverse-{@link Core}. * The implementation of the Multiverse-{@link Core}.
*/ */
public class MultiverseCore extends JavaPlugin implements MVPlugin, 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. // TODO: Investigate if this one is really needed to be static.
// Doubt it. -- FernFerret // Doubt it. -- FernFerret
private static Map<String, String> teleportQueue = new HashMap<String, String>(); private static Map<String, String> teleportQueue = new HashMap<String, String>();
@ -859,7 +859,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
/** /**
* This method is currently used by other plugins. * This method is currently used by other plugins.
* It will be removed in 2.4 * It will be removed in 2.4
* @return * @return The Multiverse config.
* @deprecated This is deprecated.
*/ */
@Deprecated @Deprecated
public static MultiverseCoreConfiguration getStaticConfig() { public static MultiverseCoreConfiguration getStaticConfig() {

2
src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java
View File

@ -64,7 +64,7 @@ public class InfoCommand extends MultiverseCommand {
if (this.worldManager.isMVWorld(args.get(0))) { if (this.worldManager.isMVWorld(args.get(0))) {
// then we have a world! // then we have a world!
worldName = args.get(0); 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("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))); sender.sendMessage(String.format("You can load it with: %s/mv load %s", ChatColor.AQUA, args.get(0)));
return; return;

3
src/main/java/com/onarandombox/MultiverseCore/configuration/MVConfigMigrator.java
View File

@ -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 @Deprecated
public abstract class MVConfigMigrator { public abstract class MVConfigMigrator {

4
src/main/java/com/onarandombox/MultiverseCore/utils/MVPermissions.java
View File

@ -43,10 +43,6 @@ public class MVPermissions implements PermissionsInterface {
* @return True if they should bypass restrictions. * @return True if they should bypass restrictions.
*/ */
public boolean canIgnoreGameModeRestriction(Player p, MultiverseWorld w) { 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()); return p.hasPermission("mv.bypass.gamemode." + w.getName());
} }

2
src/main/java/com/onarandombox/MultiverseCore/utils/MVPlayerSession.java
View File

@ -7,8 +7,6 @@
package com.onarandombox.MultiverseCore.utils; package com.onarandombox.MultiverseCore.utils;
import com.onarandombox.MultiverseCore.MultiverseCoreConfiguration;
import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig; import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;