Merge pull request #62 from SpigotMC/master

SpigotMC#1930: Don't handle upstream packets if no server connected
HexagonMC · Aug 4, 2016 · 5565798 · 5565798
2 parents 9a65016 + 3a0b0aa
commit 5565798
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -83,14 +83,17 @@ public void disconnected(ChannelWrapper channel) throws Exception
         }
     }
 
+    @Override
+    public boolean shouldHandle(PacketWrapper packet) throws Exception
+    {
+        return con.getServer() != null;
+    }
+
     @Override
     public void handle(PacketWrapper packet) throws Exception
     {
         con.getEntityRewrite().rewriteServerbound( packet.buf, con.getClientEntityId(), con.getServerEntityId() );
-        if ( con.getServer() != null )
-        {
-            con.getServer().getCh().write( packet );
-        }
+        con.getServer().getCh().write( packet );
     }
 
     @Override