PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Code format.

Browse Source
This commit is contained in:
md_5
2014-04-13 14:15:41 +10:00
parent 3b71a2b570
commit dc2da29c16
15 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/src/main/java/net/md_5/bungee/EntityMap.java
View File

@@ -163,7 +163,7 @@ public class EntityMap
packet.readerIndex( readerIndex );
packet.writerIndex( readerIndex + packetIdLength + idLength );
DefinedPacket.writeString( player.getUniqueId().toString(), packet );
DefinedPacket.writeString( username, packet);
DefinedPacket.writeString( username, packet );
DefinedPacket.writeVarInt( profile.getProperties().length, packet );
for ( LoginResult.Property property : profile.getProperties() )
{

2
proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java
View File

@@ -28,7 +28,7 @@ public class PlayerInfoSerializer implements JsonSerializer<ServerPing.PlayerInf
JsonObject js = json.getAsJsonObject();
ServerPing.PlayerInfo info = new ServerPing.PlayerInfo( js.get( "name" ).getAsString(), (UUID) null );
String id = js.get( "id" ).getAsString();
if ( protocol == 4 || !id.contains( "-" ))
if ( protocol == 4 || !id.contains( "-" ) )
{
info.setId( id );
} else

3
proxy/src/main/java/net/md_5/bungee/command/CommandEnd.java
View File

@@ -5,7 +5,8 @@ import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.plugin.Command;
/**
* Command to terminate the proxy instance. May only be used by the console by default.
* Command to terminate the proxy instance. May only be used by the console by
* default.
*/
public class CommandEnd extends Command
{

2
proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
View File

@@ -20,7 +20,7 @@ public class CommandReload extends Command
BungeeCord.getInstance().config.load();
BungeeCord.getInstance().stopListeners();
BungeeCord.getInstance().startListeners();
BungeeCord.getInstance().getPluginManager().callEvent(new ProxyReloadEvent(sender));
BungeeCord.getInstance().getPluginManager().callEvent( new ProxyReloadEvent( sender ) );
sender.sendMessage( ChatColor.BOLD.toString() + ChatColor.RED.toString() + "BungeeCord has been reloaded."
+ " This is NOT advisable and you will not be supported with any issues that arise! Please restart BungeeCord ASAP." );

2
proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
View File

@@ -172,7 +172,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
if ( forced != null && listener.isPingPassthrough() )
{
((BungeeServerInfo) forced).ping( pingBack, handshake.getProtocolVersion() );
( (BungeeServerInfo) forced ).ping( pingBack, handshake.getProtocolVersion() );
} else
{
int protocol = ( Protocol.supportedVersions.contains( handshake.getProtocolVersion() ) ) ? handshake.getProtocolVersion() : -1;

3
proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
View File

@@ -13,7 +13,8 @@ public class LoginResult
@Data
@AllArgsConstructor
public static class Property {
public static class Property
{
private String name;
private String value;