Skip to content

Commit

Permalink
Merge upstream - Minecraft 1.13-pre7 support
Browse files Browse the repository at this point in the history
  • Loading branch information
@Black-Hole @jamierocks
Black-Hole authored and jamierocks committed Jul 15, 2018
1 parent 8d79956 commit 6a77c81
Show file tree
Hide file tree
Showing 25 changed files with 202 additions and 200 deletions.
2 changes: 1 addition & 1 deletion BungeeCord
Submodule BungeeCord updated 48 files
+1 −1 README.md
+2 −2 api/pom.xml
+0 −10 api/src/main/java/net/md_5/bungee/api/ProxyServer.java
+8 −0 api/src/main/java/net/md_5/bungee/api/config/ServerInfo.java
+4 −0 api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
+4 −0 api/src/main/java/net/md_5/bungee/api/connection/Server.java
+1 −1 api/src/main/java/net/md_5/bungee/api/score/Team.java
+2 −2 bootstrap/pom.xml
+2 −2 chat/pom.xml
+3 −3 chat/src/main/java/net/md_5/bungee/api/chat/TranslatableComponent.java
+1 −1 chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
+3 −3 config/pom.xml
+2 −2 event/pom.xml
+2 −2 log/pom.xml
+2 −2 module/cmd-alert/pom.xml
+2 −2 module/cmd-find/pom.xml
+2 −2 module/cmd-list/pom.xml
+2 −2 module/cmd-send/pom.xml
+2 −2 module/cmd-server/pom.xml
+2 −2 module/pom.xml
+2 −2 module/reconnect-yaml/pom.xml
+2 −2 native/pom.xml
+1 −1 pom.xml
+2 −2 protocol/pom.xml
+10 −0 protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
+64 −27 protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+5 −2 protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
+51 −0 protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginPayloadRequest.java
+58 −0 protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginPayloadResponse.java
+30 −3 protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
+33 −3 protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java
+42 −13 protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java
+71 −5 protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteResponse.java
+27 −7 protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
+17 −0 protocol/src/test/java/net/md_5/bungee/protocol/packet/PluginMessageTest.java
+2 −2 proxy/pom.xml
+6 −2 proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+0 −1 proxy/src/main/java/net/md_5/bungee/PacketConstants.java
+16 −3 proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+10 −3 proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+17 −0 proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+11 −0 proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java
+7 −2 proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+71 −18 proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+183 −0 proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_13.java
+15 −0 proxy/src/main/java/net/md_5/bungee/util/BufUtil.java
+1 −1 proxy/src/main/java/net/md_5/bungee/util/ChatComponentTransformer.java
+2 −2 query/pom.xml
Loading

0 comments on commit 6a77c81

Please sign in to comment.