From f81bf8e7c5907282da23c29866da78ff555ea2a4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 6 Nov 2013 20:11:17 +1100 Subject: [PATCH] Code format + fix pom --- .../net/md_5/bungee/api/connection/PendingConnection.java | 8 ++++---- .../java/net/md_5/bungee/api/event/PreLoginEvent.java | 5 +++-- .../main/java/net/md_5/bungee/api/plugin/TabExecutor.java | 1 - pom.xml | 2 +- proxy/src/main/java/net/md_5/bungee/Metrics.java | 3 ++- proxy/src/main/java/net/md_5/bungee/UserConnection.java | 2 +- .../main/java/net/md_5/bungee/config/Configuration.java | 2 +- .../java/net/md_5/bungee/connection/InitialHandler.java | 2 +- proxy/src/test/java/net/md_5/bungee/ThrottleTest.java | 8 +++++--- 9 files changed, 18 insertions(+), 15 deletions(-) diff --git a/api/src/main/java/net/md_5/bungee/api/connection/PendingConnection.java b/api/src/main/java/net/md_5/bungee/api/connection/PendingConnection.java index abad7127..3c84687f 100644 --- a/api/src/main/java/net/md_5/bungee/api/connection/PendingConnection.java +++ b/api/src/main/java/net/md_5/bungee/api/connection/PendingConnection.java @@ -43,18 +43,18 @@ public interface PendingConnection extends Connection * @return the UUID */ String getUUID(); - + /** * Get this connection's online mode. * * @return the online mode */ boolean isOnlineMode(); - + /** * Set this connection's online mode. - * - * @param onlineMode + * + * @param onlineMode */ void setOnlineMode(boolean onlineMode); } diff --git a/api/src/main/java/net/md_5/bungee/api/event/PreLoginEvent.java b/api/src/main/java/net/md_5/bungee/api/event/PreLoginEvent.java index 3e148afd..56d54246 100644 --- a/api/src/main/java/net/md_5/bungee/api/event/PreLoginEvent.java +++ b/api/src/main/java/net/md_5/bungee/api/event/PreLoginEvent.java @@ -14,7 +14,8 @@ import net.md_5.bungee.api.plugin.Cancellable; @Data @ToString(callSuper = false) @EqualsAndHashCode(callSuper = false) -public class PreLoginEvent extends AsyncEvent implements Cancellable { +public class PreLoginEvent extends AsyncEvent implements Cancellable +{ /** * Cancelled state. @@ -34,4 +35,4 @@ public class PreLoginEvent extends AsyncEvent implements Cancella super( done ); this.connection = connection; } -} \ No newline at end of file +} diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/TabExecutor.java b/api/src/main/java/net/md_5/bungee/api/plugin/TabExecutor.java index cdf5174b..fb63ea4d 100644 --- a/api/src/main/java/net/md_5/bungee/api/plugin/TabExecutor.java +++ b/api/src/main/java/net/md_5/bungee/api/plugin/TabExecutor.java @@ -2,7 +2,6 @@ package net.md_5.bungee.api.plugin; import net.md_5.bungee.api.CommandSender; - public interface TabExecutor { diff --git a/pom.xml b/pom.xml index cf3da354..52b1fda5 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ https://github.com/SpigotMC/BungeeCord 2012 - Elastic Portal Suite + SpigotMC https://github.com/SpigotMC diff --git a/proxy/src/main/java/net/md_5/bungee/Metrics.java b/proxy/src/main/java/net/md_5/bungee/Metrics.java index 871d6a46..95239878 100644 --- a/proxy/src/main/java/net/md_5/bungee/Metrics.java +++ b/proxy/src/main/java/net/md_5/bungee/Metrics.java @@ -97,7 +97,8 @@ public class Metrics extends TimerTask } /** - *

Encode a key/value data pair to be used in a HTTP post request. This + *

+ * Encode a key/value data pair to be used in a HTTP post request. This * INCLUDES a & so the first key/value pair MUST be included manually, * e.g:

* diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java index ae028983..a928476e 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -264,7 +264,7 @@ public final class UserConnection implements ProxiedPlayer if ( ch.getHandle().isActive() ) { bungee.getLogger().log( Level.INFO, "[" + getName() + "] disconnected with: " + reason ); - unsafe().sendPacket( new Kick(reason) ); + unsafe().sendPacket( new Kick( reason ) ); ch.close(); if ( server != null ) { diff --git a/proxy/src/main/java/net/md_5/bungee/config/Configuration.java b/proxy/src/main/java/net/md_5/bungee/config/Configuration.java index c8c9ed85..c45643fb 100644 --- a/proxy/src/main/java/net/md_5/bungee/config/Configuration.java +++ b/proxy/src/main/java/net/md_5/bungee/config/Configuration.java @@ -60,7 +60,7 @@ public class Configuration File fav = new File( "server-icon.png" ); if ( fav.exists() ) { - + try { favicon = "data:image/png;base64," + BaseEncoding.base64().encode( Files.toByteArray( fav ) ); diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java index 102d7333..c9afc300 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java @@ -275,7 +275,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection thisState = State.ENCRYPT; } }; - + // fire pre login event bungee.getPluginManager().callEvent( new PreLoginEvent( InitialHandler.this, callback ) ); } diff --git a/proxy/src/test/java/net/md_5/bungee/ThrottleTest.java b/proxy/src/test/java/net/md_5/bungee/ThrottleTest.java index e16a0878..b7f7abd5 100644 --- a/proxy/src/test/java/net/md_5/bungee/ThrottleTest.java +++ b/proxy/src/test/java/net/md_5/bungee/ThrottleTest.java @@ -13,10 +13,12 @@ public class ThrottleTest { ConnectionThrottle throttle = new ConnectionThrottle( 5 ); InetAddress address; - - try { + + try + { address = InetAddress.getLocalHost(); - } catch (UnknownHostException ex) { + } catch ( UnknownHostException ex ) + { address = InetAddress.getByName( null ); }