PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Add getServerInfo(name) and rework plugin channel system for stupud Bukkit limitations.

Browse Source
This commit is contained in:
md_5 2013-01-24 14:13:27 +11:00
parent 8f32374cda
commit 8797a29761
3 changed files with 52 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/main/java/net/md_5/bungee/api/ProxyServer.java
View File

@ -87,6 +87,14 @@ public abstract class ProxyServer
*/ */
public abstract Map<String, ServerInfo> getServers(); public abstract Map<String, ServerInfo> getServers();
/**
* Gets the server info of a server.
*
* @param name the name of the configured server
* @return the server info belonging to the specified server
*/
public abstract ServerInfo getServerInfo(String name);
/** /**
* Get the {@link PluginManager} associated with loading plugins and * Get the {@link PluginManager} associated with loading plugins and
* dispatching events. It is recommended that implementations use the * dispatching events. It is recommended that implementations use the

10
proxy/src/main/java/net/md_5/bungee/BungeeCord.java
View File

@ -105,9 +105,7 @@ public class BungeeCord extends ProxyServer
getPluginManager().registerCommand(new CommandAlert()); getPluginManager().registerCommand(new CommandAlert());
getPluginManager().registerCommand(new CommandBungee()); getPluginManager().registerCommand(new CommandBungee());
registerChannel("BungeeCord::Disconnect"); registerChannel("BungeeCord");
registerChannel("BungeeCord::Connect");
registerChannel("BungeeCord::Forward");
} }
public static BungeeCord getInstance() public static BungeeCord getInstance()
@ -291,6 +289,12 @@ public class BungeeCord extends ProxyServer
return config.getServers(); return config.getServers();
} }
@Override
public ServerInfo getServerInfo(String name)
{
return getServers().get(name);
}
@Override @Override
@Synchronized("pluginChannels") @Synchronized("pluginChannels")
public void registerChannel(String channel) public void registerChannel(String channel)

18
proxy/src/main/java/net/md_5/bungee/UserConnection.java
View File

@ -282,6 +282,13 @@ public class UserConnection extends GenericConnection implements ProxiedPlayer
case 0xFA: case 0xFA:
// Call the onPluginMessage event // Call the onPluginMessage event
PacketFAPluginMessage message = new PacketFAPluginMessage(packet); PacketFAPluginMessage message = new PacketFAPluginMessage(packet);
// Might matter in the future
if (message.tag.equals("BungeeCord"))
{
continue;
}
PluginMessageEvent event = new PluginMessageEvent(UserConnection.this, server, message.tag, message.data); PluginMessageEvent event = new PluginMessageEvent(UserConnection.this, server, message.tag, message.data);
ProxyServer.getInstance().getPluginManager().callEvent(event); ProxyServer.getInstance().getPluginManager().callEvent(event);
@ -371,11 +378,13 @@ public class UserConnection extends GenericConnection implements ProxiedPlayer
continue; continue;
} }
switch (message.tag) if (message.tag.equals("BungeeCord"))
{ {
case "BungeeCord::Disconnect": switch (in.readUTF())
{
case "Disconnect":
break outer; break outer;
case "BungeeCord::Forward": case "Forward":
String target = in.readUTF(); String target = in.readUTF();
String channel = in.readUTF(); String channel = in.readUTF();
short len = in.readShort(); short len = in.readShort();
@ -396,7 +405,7 @@ public class UserConnection extends GenericConnection implements ProxiedPlayer
} }
break; break;
case "BungeeCord::Connect": case "Connect":
ServerInfo server = BungeeCord.getInstance().config.getServers().get(in.readUTF()); ServerInfo server = BungeeCord.getInstance().config.getServers().get(in.readUTF());
if (server != null) if (server != null)
{ {
@ -406,6 +415,7 @@ public class UserConnection extends GenericConnection implements ProxiedPlayer
break; break;
} }
} }
}
while (!packetQueue.isEmpty()) while (!packetQueue.isEmpty())
{ {