diff --git a/pom.xml b/pom.xml
index 49a884b9..787d46c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,13 +187,13 @@
compile
-
+
+ End of Spout -->
me.main__.util
diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
index 2ad337c3..71ad6408 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
@@ -159,7 +159,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
private AllPay banker;
private int pluginCount;
private DestinationFactory destFactory;
- private SpoutInterface spoutInterface = null;
+ //private SpoutInterface spoutInterface = null;
private MultiverseMessaging messaging;
private BlockSafety blockSafety;
private LocationManipulation locationManipulation;
@@ -253,11 +253,13 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
// A test that had no worlds loaded was being run. This should never happen in production
}
this.saveMVConfig();
+ /*
// Check to see if spout was already loaded (most likely):
if (this.getServer().getPluginManager().getPlugin("Spout") != null) {
this.setSpout();
this.log(Level.INFO, "Spout integration enabled.");
}
+ */
}
private void initializeDestinationFactory() {
@@ -662,9 +664,10 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
this.serverFolder = newServerFolder;
}
+ /*
/**
* Initializes Spout.
- */
+ * /
public void setSpout() {
this.spoutInterface = new SpoutInterface();
this.commandHandler.registerCommand(new SpoutCommand(this));
@@ -674,10 +677,11 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
* Gets our {@link SpoutInterface}.
*
* @return The {@link SpoutInterface} we're using.
- */
+ * /
public SpoutInterface getSpout() {
return this.spoutInterface;
}
+ */
/**
* {@inheritDoc}
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/SpoutCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/SpoutCommand.java
index b993d5b1..3683d937 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/SpoutCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/SpoutCommand.java
@@ -4,7 +4,7 @@
* For more information please check the README.md file included *
* with this project. *
******************************************************************************/
-
+/*
package com.onarandombox.MultiverseCore.commands;
import com.onarandombox.MultiverseCore.MultiverseCore;
@@ -21,7 +21,7 @@ import java.util.List;
/**
* Edit a world with spout.
- */
+ * /
public class SpoutCommand extends MultiverseCommand {
public SpoutCommand(MultiverseCore plugin) {
@@ -51,7 +51,7 @@ public class SpoutCommand extends MultiverseCommand {
}
PopupScreen pop = new GenericPopup();
GenericButton button = new GenericButton("Fish");
- // TODO maybe use constants for these
+ // TO-DO maybe use constants for these
// BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
button.setX(50);
button.setY(50);
@@ -63,3 +63,4 @@ public class SpoutCommand extends MultiverseCommand {
p.getMainScreen().attachPopupScreen(pop);
}
}
+*/
diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPluginListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPluginListener.java
index 001a490f..3d255703 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPluginListener.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPluginListener.java
@@ -16,7 +16,6 @@ import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.PluginEnableEvent;
import java.util.Arrays;
-import java.util.logging.Level;
/**
* Multiverse's Plugin {@link Listener}.
@@ -40,10 +39,12 @@ public class MVPluginListener implements Listener {
this.plugin.setBank(this.plugin.getBanker().loadEconPlugin());
}
+ /*
if (event.getPlugin().getDescription().getName().equals("Spout")) {
this.plugin.setSpout();
this.plugin.log(Level.INFO, "Spout integration enabled.");
}
+ */
}
/**
diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/SpoutInterface.java b/src/main/java/com/onarandombox/MultiverseCore/utils/SpoutInterface.java
index 2d0e817d..19221508 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/utils/SpoutInterface.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/utils/SpoutInterface.java
@@ -4,14 +4,14 @@
* For more information please check the README.md file included *
* with this project. *
******************************************************************************/
-
+/*
package com.onarandombox.MultiverseCore.utils;
import org.getspout.spoutapi.SpoutManager;
/**
* A helper-class holding the {@link SpoutManager}.
- */
+ * /
public class SpoutInterface {
private SpoutManager spoutManager;
@@ -22,8 +22,9 @@ public class SpoutInterface {
/**
* Gets the {@link SpoutManager}.
* @return The {@link SpoutManager}.
- */
+ * /
public SpoutManager getManager() {
return this.spoutManager;
}
}
+*/