Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-24 19:25:16 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream, Minecraft 1.11 Support

Browse Source
This commit is contained in:
Jamie Mansfield 2016-11-14 17:04:25 +00:00
parent 6d3a02cba2
commit 65bfdc7fe1
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
5 changed files with 81 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 1ad81564adfb7e0ede2c2a13eab547158d29fadb
Subproject commit 9ecdde2292885b2fbf95c43a386c291f735a1770

112
BungeeCord-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From eab0133fe2fb82765602761a65333af48f98fadc Mon Sep 17 00:00:00 2001
From 9c75ec25896ccbd216591fcfa52de66d67cbfe36 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 10:33:31 -0700
Subject: [PATCH] POM Changes
@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
Require Java 8
diff --git a/api/pom.xml b/api/pom.xml
index bd89a6b..b276c45 100644
index 43a4dd9..bc7911a 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,42 @@
@ -17,7 +17,7 @@ index bd89a6b..b276c45 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -25,7 +25,7 @@ index bd89a6b..b276c45 100644
- <artifactId>bungeecord-api</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-api</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-API</name>
@ -66,7 +66,7 @@ index bd89a6b..b276c45 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 9eb904b..07cf1d0 100644
index 5c42c6f..bcc098f 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -4,19 +4,19 @@
@ -77,7 +77,7 @@ index 9eb904b..07cf1d0 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -85,7 +85,7 @@ index 9eb904b..07cf1d0 100644
- <artifactId>bungeecord-bootstrap</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-bootstrap</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Bootstrap</name>
@ -141,7 +141,7 @@ index b7cb81e..a4516ed 100644
return;
}
diff --git a/chat/pom.xml b/chat/pom.xml
index 79a774a..866b39a 100644
index e8f3fd6..5e5e141 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -4,23 +4,24 @@
@ -152,7 +152,7 @@ index 79a774a..866b39a 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -160,7 +160,7 @@ index 79a774a..866b39a 100644
- <artifactId>bungeecord-chat</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-chat</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Chat</name>
@ -178,7 +178,7 @@ index 79a774a..866b39a 100644
<dependencies>
diff --git a/config/pom.xml b/config/pom.xml
index c6d0a0b..8280c2d 100644
index 5d32d0e..28775e1 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -4,19 +4,19 @@
@ -189,7 +189,7 @@ index c6d0a0b..8280c2d 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -197,7 +197,7 @@ index c6d0a0b..8280c2d 100644
- <artifactId>bungeecord-config</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-config</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Config</name>
@ -208,7 +208,7 @@ index c6d0a0b..8280c2d 100644
<dependencies>
<dependency>
diff --git a/event/pom.xml b/event/pom.xml
index 6688153..f9615cf 100644
index 65a6422..784be89 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -4,17 +4,17 @@
@ -219,7 +219,7 @@ index 6688153..f9615cf 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -227,7 +227,7 @@ index 6688153..f9615cf 100644
- <artifactId>bungeecord-event</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-event</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Event</name>
@ -236,7 +236,7 @@ index 6688153..f9615cf 100644
+ <description>Generic java event dispatching API intended for use with Waterfall.</description>
</project>
diff --git a/log/pom.xml b/log/pom.xml
index b970df0..70b874a 100644
index 22a933f..bbccf73 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -4,19 +4,19 @@
@ -247,7 +247,7 @@ index b970df0..70b874a 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -255,7 +255,7 @@ index b970df0..70b874a 100644
- <artifactId>bungeecord-log</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Log</name>
@ -277,7 +277,7 @@ index b970df0..70b874a 100644
<scope>compile</scope>
</dependency>
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index 3156334..0c076f9 100644
index 223d0f6..56d006d 100644
--- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml
@@ -4,14 +4,14 @@
@ -288,7 +288,7 @@ index 3156334..0c076f9 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -296,11 +296,11 @@ index 3156334..0c076f9 100644
- <artifactId>bungeecord-module-cmd-alert</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-alert</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index 2a9b50f..2cf8d6d 100644
index 7635889..8ce35aa 100644
--- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml
@@ -4,14 +4,14 @@
@ -311,7 +311,7 @@ index 2a9b50f..2cf8d6d 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -319,11 +319,11 @@ index 2a9b50f..2cf8d6d 100644
- <artifactId>bungeecord-module-cmd-find</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-find</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index e68aa93..0300b5c 100644
index 76158bc..926f2ff 100644
--- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml
@@ -4,14 +4,14 @@
@ -334,7 +334,7 @@ index e68aa93..0300b5c 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -342,11 +342,11 @@ index e68aa93..0300b5c 100644
- <artifactId>bungeecord-module-cmd-list</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-list</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index 7a08753..6d96f3a 100644
index 8737541..e028c34 100644
--- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml
@@ -4,14 +4,14 @@
@ -357,7 +357,7 @@ index 7a08753..6d96f3a 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -365,11 +365,11 @@ index 7a08753..6d96f3a 100644
- <artifactId>bungeecord-module-cmd-send</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-send</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index d3fb072..1c508e3 100644
index 8a0ed9d..2961a64 100644
--- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml
@@ -4,14 +4,14 @@
@ -380,7 +380,7 @@ index d3fb072..1c508e3 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -388,11 +388,11 @@ index d3fb072..1c508e3 100644
- <artifactId>bungeecord-module-cmd-server</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-server</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
index c59ac9d..14f4e9e 100644
index 2d51746..009b68b 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -4,19 +4,19 @@
@ -403,7 +403,7 @@ index c59ac9d..14f4e9e 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -411,7 +411,7 @@ index c59ac9d..14f4e9e 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord Modules</name>
@ -439,7 +439,7 @@ index c59ac9d..14f4e9e 100644
<scope>compile</scope>
</dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
index 7bd5521..93d2b4a 100644
index c08ad70..06159ba 100644
--- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml
@@ -4,14 +4,14 @@
@ -450,7 +450,7 @@ index 7bd5521..93d2b4a 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -458,11 +458,11 @@ index 7bd5521..93d2b4a 100644
- <artifactId>bungeecord-module-reconnect-yaml</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-reconnect-yaml</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml
index a3bd632..a2b422c 100644
index 940d257..18861da 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -4,19 +4,19 @@
@ -473,7 +473,7 @@ index a3bd632..a2b422c 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -481,7 +481,7 @@ index a3bd632..a2b422c 100644
- <artifactId>bungeecord-native</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-native</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Native</name>
@ -492,7 +492,7 @@ index a3bd632..a2b422c 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index ad09889..d8a5633 100644
index 7f9564c..10ddfab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,18 +9,18 @@
@ -503,7 +503,7 @@ index ad09889..d8a5633 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord-Parent</name>
@ -578,7 +578,7 @@ index ad09889..d8a5633 100644
+
<properties>
<build.number>unknown</build.number>
<netty.version>4.1.5.Final</netty.version>
<netty.version>4.1.6.Final</netty.version>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <!-- Require Java 8 -->
@ -678,7 +678,7 @@ index ad09889..d8a5633 100644
+ </profiles>
</project>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index bac4690..7a74143 100644
index 63d0498..3421be0 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -4,24 +4,24 @@
@ -689,7 +689,7 @@ index bac4690..7a74143 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -697,7 +697,7 @@ index bac4690..7a74143 100644
- <artifactId>bungeecord-protocol</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-protocol</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Protocol</name>
@ -715,7 +715,7 @@ index bac4690..7a74143 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 515f2ee..0747614 100644
index 703fbda..1220a41 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
@ -726,7 +726,7 @@ index 515f2ee..0747614 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -734,7 +734,7 @@ index 515f2ee..0747614 100644
- <artifactId>bungeecord-proxy</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-proxy</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Proxy</name>
@ -786,7 +786,7 @@ index 515f2ee..0747614 100644
<scope>compile</scope>
</dependency>
diff --git a/query/pom.xml b/query/pom.xml
index 8df9b12..1d76633 100644
index fbadb18..349d5cc 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -4,19 +4,19 @@
@ -797,7 +797,7 @@ index 8df9b12..1d76633 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -805,7 +805,7 @@ index 8df9b12..1d76633 100644
- <artifactId>bungeecord-query</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-query</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.11-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Query</name>
@ -827,5 +827,5 @@ index 8df9b12..1d76633 100644
<scope>compile</scope>
</dependency>
--
2.7.4
2.10.0

12
BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch
View File

@ -1,4 +1,4 @@
From 780ffb41cfec181cc59564909ecb681bbbfc354a Mon Sep 17 00:00:00 2001
From c010e5f3d60e76061b99aa1da64243a866f465ab Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers
@ -37,10 +37,10 @@ index e7cb380..447eaae 100644
{
packet.read( in, prot.getDirection(), protocolVersion );
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index d15d4ed..db2843f 100644
index c5a7add..7ec0f29 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -278,14 +278,18 @@ public enum Protocol
@@ -279,14 +279,18 @@ public enum Protocol
return protocol;
}
@ -101,10 +101,10 @@ index 042dab3..6d197ef 100644
@Getter
@NonNull
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
index 7eb48e0..f3c886a 100644
index 34ddc19..a86b6d5 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -105,6 +105,12 @@ public abstract class EntityMap
@@ -107,6 +107,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex;
@ -118,5 +118,5 @@ index 7eb48e0..f3c886a 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.7.4 (Apple Git-66)
2.10.0

6
BungeeCord-Patches/0030-Better-debug-checks.patch
View File

@ -1,14 +1,14 @@
From 0d5af31570a42d366fdcf2c4228a4b2a6716006c Mon Sep 17 00:00:00 2001
From 576e048b3cdd05938f69a54e4a6510dc501734af Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Wed, 6 Apr 2016 23:46:00 -0700
Subject: [PATCH] Better debug checks
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index db2843f..4decbb2 100644
index 7ec0f29..0aa16c3 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -346,7 +346,7 @@ public enum Protocol
@@ -347,7 +347,7 @@ public enum Protocol
{
throw new BadPacketException( "Unsupported protocol version" );
}

31
BungeeCord-Patches/0036-Proxy-query-event.patch
View File

@ -1,4 +1,4 @@
From 02239d6bb1bc5c60eb46ef6f1802f63efacc298f Mon Sep 17 00:00:00 2001
From dff3f58774e79f8e655813e21b0ea0d7c724e15b Mon Sep 17 00:00:00 2001
From: minecrafter <unknown@unknown>
Date: Sun, 3 Jul 2016 04:03:21 -0400
Subject: [PATCH] Proxy query event
@ -107,33 +107,32 @@ index 0000000..220d59f
+ private QueryResult result;
+}
diff --git a/query/src/main/java/net/md_5/bungee/query/QueryHandler.java b/query/src/main/java/net/md_5/bungee/query/QueryHandler.java
index 0be915c..e577b3f 100644
index 614dd94..8d28867 100644
--- a/query/src/main/java/net/md_5/bungee/query/QueryHandler.java
+++ b/query/src/main/java/net/md_5/bungee/query/QueryHandler.java
@@ -1,17 +1,18 @@
package net.md_5.bungee.query;
@@ -2,6 +2,8 @@ package net.md_5.bungee.query;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
+import io.github.waterfallmc.waterfall.QueryResult;
+import io.github.waterfallmc.waterfall.event.ProxyQueryEvent;
import io.netty.buffer.ByteBuf;
import io.netty.channel.AddressedEnvelope;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
@@ -9,10 +11,12 @@ import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.channel.socket.DatagramPacket;
import java.nio.ByteOrder;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
import java.net.InetAddress;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
+import java.util.stream.Collectors;
+
import lombok.Data;
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.ListenerInfo;
@@ -82,19 +83,30 @@ public class QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
@@ -84,19 +88,30 @@ public class QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
throw new IllegalStateException( "No session!" );
}
@ -171,7 +170,7 @@ index 0be915c..e577b3f 100644
} else if ( in.readableBytes() == 4 )
{
// Long Response
@@ -104,18 +116,20 @@ public class QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
@@ -106,18 +121,20 @@ public class QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
} );
Map<String, String> data = new LinkedHashMap<>();
@ -202,7 +201,7 @@ index 0be915c..e577b3f 100644
for ( Map.Entry<String, String> entry : data.entrySet() )
{
@@ -127,10 +141,7 @@ public class QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
@@ -129,10 +146,7 @@ public class QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
// Padding
writeString( out, "\01player_\00" );
// Player List