PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

#2297: Use server field on DownstreamBridge

Browse Source
This commit is contained in:
md_5 2017-12-01 12:23:07 +11:00
parent 4c84f37fd2
commit 1dbfcfb0b5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,7 +223,7 @@ public class DownstreamBridge extends PacketHandler
public void handle(PluginMessage pluginMessage) throws Exception public void handle(PluginMessage pluginMessage) throws Exception
{ {
DataInput in = pluginMessage.getStream(); DataInput in = pluginMessage.getStream();
PluginMessageEvent event = new PluginMessageEvent( con.getServer(), con, pluginMessage.getTag(), pluginMessage.getData().clone() ); PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
if ( bungee.getPluginManager().callEvent( event ).isCancelled() ) if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
{ {
@ -297,7 +297,7 @@ public class DownstreamBridge extends PacketHandler
{ {
for ( ServerInfo server : bungee.getServers().values() ) for ( ServerInfo server : bungee.getServers().values() )
{ {
if ( server != con.getServer().getInfo() ) if ( server != this.server.getInfo() )
{ {
server.sendData( "BungeeCord", payload ); server.sendData( "BungeeCord", payload );
} }
@ -306,7 +306,7 @@ public class DownstreamBridge extends PacketHandler
{ {
for ( ServerInfo server : bungee.getServers().values() ) for ( ServerInfo server : bungee.getServers().values() )
{ {
if ( server != con.getServer().getInfo() ) if ( server != this.server.getInfo() )
{ {
server.sendData( "BungeeCord", payload, false ); server.sendData( "BungeeCord", payload, false );
} }
@ -442,7 +442,7 @@ public class DownstreamBridge extends PacketHandler
byte[] b = out.toByteArray(); byte[] b = out.toByteArray();
if ( b.length != 0 ) if ( b.length != 0 )
{ {
con.getServer().sendData( "BungeeCord", b ); server.sendData( "BungeeCord", b );
} }
} }
@ -475,7 +475,7 @@ public class DownstreamBridge extends PacketHandler
@Override @Override
public void handle(TabCompleteResponse tabCompleteResponse) throws Exception public void handle(TabCompleteResponse tabCompleteResponse) throws Exception
{ {
TabCompleteResponseEvent tabCompleteResponseEvent = new TabCompleteResponseEvent( con.getServer(), con, tabCompleteResponse.getCommands() ); TabCompleteResponseEvent tabCompleteResponseEvent = new TabCompleteResponseEvent( server, con, tabCompleteResponse.getCommands() );
if ( !bungee.getPluginManager().callEvent( tabCompleteResponseEvent ).isCancelled() ) if ( !bungee.getPluginManager().callEvent( tabCompleteResponseEvent ).isCancelled() )
{ {