PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Formatting & dependency updates

Browse Source
This commit is contained in:
md_5 2017-08-06 11:18:14 +10:00
parent 2ae8ba0afc
commit da88d5c502
8 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap/pom.xml
View File

@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>net.sf.jopt-simple</groupId> <groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId> <artifactId>jopt-simple</artifactId>
<version>4.8</version> <version>4.9</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -46,7 +46,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.4</version> <version>3.0.2</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>
@ -60,7 +60,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>2.1</version> <version>3.0.0</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>

4
pom.xml
View File

@ -87,8 +87,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.findbugs</groupId> <groupId>com.google.code.findbugs</groupId>
<artifactId>findbugs</artifactId> <artifactId>findbugs-annotations</artifactId>
<version>3.0.0</version> <version>3.0.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

2
proxy/pom.xml
View File

@ -87,7 +87,7 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.42</version> <version>5.1.43</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
</dependencies> </dependencies>

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

@ -255,7 +255,7 @@ public final class UserConnection implements ProxiedPlayer
if ( getServer() == null && !ch.isClosing() ) if ( getServer() == null && !ch.isClosing() )
{ {
throw new IllegalStateException("Cancelled ServerConnectEvent with no server or disconnect."); throw new IllegalStateException( "Cancelled ServerConnectEvent with no server or disconnect." );
} }
return; return;
} }

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

@ -85,7 +85,7 @@ public class Configuration implements ProxyConfig
throttle = adapter.getInt( "connection_throttle", throttle ); throttle = adapter.getInt( "connection_throttle", throttle );
ipForward = adapter.getBoolean( "ip_forward", ipForward ); ipForward = adapter.getBoolean( "ip_forward", ipForward );
compressionThreshold = adapter.getInt( "network_compression_threshold", compressionThreshold ); compressionThreshold = adapter.getInt( "network_compression_threshold", compressionThreshold );
preventProxyConnections = adapter.getBoolean( "prevent_proxy_connections", preventProxyConnections); preventProxyConnections = adapter.getBoolean( "prevent_proxy_connections", preventProxyConnections );
disabledCommands = new CaseInsensitiveSet( (Collection<String>) adapter.getList( "disabled_commands", Arrays.asList( "disabledcommandhere" ) ) ); disabledCommands = new CaseInsensitiveSet( (Collection<String>) adapter.getList( "disabled_commands", Arrays.asList( "disabledcommandhere" ) ) );

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

@ -1,6 +1,5 @@
package net.md_5.bungee.connection; package net.md_5.bungee.connection;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;

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

@ -562,7 +562,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override @Override
public String getName() public String getName()
{ {
return (name != null ) ? name : ( loginRequest == null ) ? null : loginRequest.getData(); return ( name != null ) ? name : ( loginRequest == null ) ? null : loginRequest.getData();
} }
@Override @Override

4
query/src/main/java/net/md_5/bungee/query/QueryHandler.java
View File

@ -27,7 +27,7 @@ public class QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
private final ListenerInfo listener; private final ListenerInfo listener;
/*========================================================================*/ /*========================================================================*/
private final Random random = new Random(); private final Random random = new Random();
private final Cache<InetAddress, QuerySession> sessions = CacheBuilder.newBuilder().expireAfterWrite( 30, TimeUnit.SECONDS).build(); private final Cache<InetAddress, QuerySession> sessions = CacheBuilder.newBuilder().expireAfterWrite( 30, TimeUnit.SECONDS ).build();
private void writeShort(ByteBuf buf, int s) private void writeShort(ByteBuf buf, int s)
{ {
@ -124,7 +124,7 @@ public class QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
writeString( out, entry.getKey() ); writeString( out, entry.getKey() );
writeString( out, entry.getValue() ); writeString( out, entry.getValue() );
} }
out.writeByte( 0x00 ); // Null out.writeByte( 0x00 ); // Null
// Padding // Padding
writeString( out, "\01player_\00" ); writeString( out, "\01player_\00" );