PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Update depend versions, limit use of most Java 1.7 APIs.

Browse Source
This commit is contained in:
md_5
2015-02-08 13:07:41 +11:00
parent 2b49358bea
commit 7c1f232e85
9 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
View File

@@ -1,5 +1,6 @@
package net.md_5.bungee;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.ChannelFuture;
@@ -11,7 +12,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.Objects;
import java.util.Queue;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -79,7 +79,7 @@ public class BungeeServerInfo implements ServerInfo
@Override
public boolean equals(Object obj)
{
return ( obj instanceof ServerInfo ) && Objects.equals( getAddress(), ( (ServerInfo) obj ).getAddress() );
return ( obj instanceof ServerInfo ) && Objects.equal( getAddress(), ( (ServerInfo) obj ).getAddress() );
}
@Override

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

@@ -1,9 +1,9 @@
package net.md_5.bungee;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import java.util.Objects;
import java.util.Queue;
import java.util.Set;
import lombok.Getter;
@@ -265,7 +265,7 @@ public class ServerConnector extends PacketHandler
public void handle(Kick kick) throws Exception
{
ServerInfo def = bungee.getServerInfo( user.getPendingConnection().getListener().getFallbackServer() );
if ( Objects.equals( target, def ) )
if ( Objects.equal( target, def ) )
{
def = null;
}

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

@@ -1,5 +1,6 @@
package net.md_5.bungee;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import io.netty.bootstrap.Bootstrap;
@@ -15,7 +16,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
@@ -228,7 +228,7 @@ public final class UserConnection implements ProxiedPlayer
final BungeeServerInfo target = (BungeeServerInfo) event.getTarget(); // Update in case the event changed target
if ( getServer() != null && Objects.equals( getServer().getInfo(), target ) )
if ( getServer() != null && Objects.equal( getServer().getInfo(), target ) )
{
sendMessage( bungee.getTranslation( "already_connected" ) );
return;

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

@@ -1,9 +1,9 @@
package net.md_5.bungee.connection;
import com.google.common.base.Objects;
import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams;
import java.io.DataInput;
import java.util.Objects;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.Unpooled;
@@ -458,7 +458,7 @@ public class DownstreamBridge extends PacketHandler
public void handle(Kick kick) throws Exception
{
ServerInfo def = bungee.getServerInfo( con.getPendingConnection().getListener().getFallbackServer() );
if ( Objects.equals( server.getInfo(), def ) )
if ( Objects.equal( server.getInfo(), def ) )
{
def = null;
}