JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some of twiggy conflicts.

Browse Source
This commit is contained in:
Jonathan Williams 2014-11-12 05:13:58 -08:00
parent 8d62966abc
commit 2e848c2ac2
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
View File

@ -44,7 +44,7 @@ public class Portal extends MiniPlugin
Bukkit.getMessenger().registerOutgoingPluginChannel(GetPlugin(), "BungeeCord"); Bukkit.getMessenger().registerOutgoingPluginChannel(GetPlugin(), "BungeeCord");
// Register the server command type for future use // Register the server command type for future use
ServerCommandManager.getInstance().registerCommandType(TransferCommand.class.getSimpleName(), TransferCommand.class); ServerCommandManager.getInstance().registerCommandType(TransferCommand.class, new TransferHandler());
} }
public void SendAllPlayers(String serverName) public void SendAllPlayers(String serverName)

3
Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java
View File

@ -3,7 +3,6 @@ package mineplex.core.report;
import mineplex.core.MiniPlugin; import mineplex.core.MiniPlugin;
import mineplex.core.report.command.ReportCloseCommand; import mineplex.core.report.command.ReportCloseCommand;
import mineplex.core.report.command.ReportCommand; import mineplex.core.report.command.ReportCommand;
import mineplex.core.report.command.ReportDebugCommand;
import mineplex.core.report.command.ReportHandleCommand; import mineplex.core.report.command.ReportHandleCommand;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
@ -27,6 +26,6 @@ public class ReportPlugin extends MiniPlugin
AddCommand(new ReportCommand(this)); AddCommand(new ReportCommand(this));
AddCommand(new ReportHandleCommand(this)); AddCommand(new ReportHandleCommand(this));
AddCommand(new ReportCloseCommand(this)); AddCommand(new ReportCloseCommand(this));
AddCommand(new ReportDebugCommand(this)); //AddCommand(new ReportDebugCommand(this));
} }
} }

2
Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerCommandManager.java
View File

@ -121,7 +121,7 @@ public class ServerCommandManager
{ {
callback.run(serverCommand); // Run callback callback.run(serverCommand); // Run callback
} }
//} }
} }
} }