Fixed some merge issues.

This commit is contained in:
CannibalVox
2013-12-06 21:14:20 -06:00
parent 2388be2681
commit 7dc51a8e56
3 changed files with 9 additions and 34 deletions

View File

@@ -41,28 +41,6 @@ public class ConnectionHandler implements IConnectionHandler
return null;
}
@Override
public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager)
{
}
@Override
public void connectionOpened(NetHandler netClientHandler,MinecraftServer server, INetworkManager manager)
{
}
@Override
public void connectionClosed(INetworkManager manager)
{
if(PocketManager.isConnected)
{
PocketManager.unload();
}
return null;
}
@Override
public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager) { }
@@ -87,16 +65,4 @@ public class ConnectionHandler implements IConnectionHandler
//Send information about all the registered dimensions and links to the client
}
@Override
public void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login)
{
return;
}
@Override
public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager)
{
}
}