PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Revert "#2714: Remove unnecessary throws in ServerConnector"

Browse Source 
This reverts commit 74a6aa32a2.

Completely breaks Bungee
This commit is contained in:
md_5 2019-12-05 12:28:12 +11:00
parent 39ef20b298
commit 70038c9144
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
proxy/src/main/java/net/md_5/bungee/ServerConnector.java
View File

@ -21,6 +21,7 @@ import net.md_5.bungee.api.score.Score;
import net.md_5.bungee.api.score.Scoreboard; import net.md_5.bungee.api.score.Scoreboard;
import net.md_5.bungee.api.score.Team; import net.md_5.bungee.api.score.Team;
import net.md_5.bungee.chat.ComponentSerializer; import net.md_5.bungee.chat.ComponentSerializer;
import net.md_5.bungee.connection.CancelSendSignal;
import net.md_5.bungee.connection.DownstreamBridge; import net.md_5.bungee.connection.DownstreamBridge;
import net.md_5.bungee.connection.LoginResult; import net.md_5.bungee.connection.LoginResult;
import net.md_5.bungee.forge.ForgeConstants; import net.md_5.bungee.forge.ForgeConstants;
@ -158,6 +159,8 @@ public class ServerConnector extends PacketHandler
{ {
user.getForgeClientHandler().resetHandshake(); user.getForgeClientHandler().resetHandshake();
} }
throw CancelSendSignal.INSTANCE;
} }
@Override @Override
@ -288,6 +291,8 @@ public class ServerConnector extends PacketHandler
bungee.getPluginManager().callEvent( new ServerSwitchEvent( user ) ); bungee.getPluginManager().callEvent( new ServerSwitchEvent( user ) );
thisState = State.FINISHED; thisState = State.FINISHED;
throw CancelSendSignal.INSTANCE;
} }
@Override @Override
@ -311,7 +316,7 @@ public class ServerConnector extends PacketHandler
{ {
obsolete = true; obsolete = true;
user.connect( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT ); user.connect( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
return; throw CancelSendSignal.INSTANCE;
} }
String message = bungee.getTranslation( "connect_kick", target.getName(), event.getKickReason() ); String message = bungee.getTranslation( "connect_kick", target.getName(), event.getKickReason() );
@ -322,6 +327,8 @@ public class ServerConnector extends PacketHandler
{ {
user.sendMessage( message ); user.sendMessage( message );
} }
throw CancelSendSignal.INSTANCE;
} }
@Override @Override
@ -363,7 +370,7 @@ public class ServerConnector extends PacketHandler
this.handshakeHandler.handle( pluginMessage ); this.handshakeHandler.handle( pluginMessage );
// We send the message as part of the handler, so don't send it here. // We send the message as part of the handler, so don't send it here.
return; throw CancelSendSignal.INSTANCE;
} }
} }