Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-28 19:47:50 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Corrected patches"

Browse Source 
This reverts commit c6cd052545.
This commit is contained in:
Tux 2017-01-04 20:04:39 -05:00
parent c6cd052545
commit 8ed5f195a6
3 changed files with 1747 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Waterfall-Proxy-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From 71be2c37afc455ff3deb042af7fb70e4dff7b50f Mon Sep 17 00:00:00 2001 From 5a8caa35c270d39bab6cddba4a7bffa3255f628f Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 08:56:43 -0500 Date: Tue, 15 Nov 2016 08:56:43 -0500
Subject: [PATCH] POM Changes Subject: [PATCH] POM Changes
@ -499,7 +499,7 @@ index 3421be0..c79809c 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml diff --git a/proxy/pom.xml b/proxy/pom.xml
index 180b78d..7fc7658 100644 index 1220a41..b38e7bf 100644
--- a/proxy/pom.xml --- a/proxy/pom.xml
+++ b/proxy/pom.xml +++ b/proxy/pom.xml
@@ -5,17 +5,17 @@ @@ -5,17 +5,17 @@
@ -523,7 +523,7 @@ index 180b78d..7fc7658 100644
<description>Proxy component of the Elastic Portal Suite</description> <description>Proxy component of the Elastic Portal Suite</description>
<dependencies> <dependencies>
@@ -54,31 +54,31 @@ @@ -40,31 +40,31 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.github.waterfallmc</groupId> <groupId>io.github.waterfallmc</groupId>
@ -597,5 +597,5 @@ index 349d5cc..a49d315 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
-- --
2.7.4 2.7.4 (Apple Git-66)

12
Waterfall-Proxy-Patches/0004-Fixup-ProtocolConstants.patch
View File

@ -1,14 +1,14 @@
From 40e9be14af583bb8b5224c4b8753460ad9735673 Mon Sep 17 00:00:00 2001 From d623e55c58449f3483f57b28681b1a831a5fe8b7 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 09:07:51 -0500 Date: Tue, 15 Nov 2016 09:07:51 -0500
Subject: [PATCH] Fixup ProtocolConstants Subject: [PATCH] Fixup ProtocolConstants
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
index 9929ef4..af80c95 100644 index f3c13bf..637262d 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
@@ -20,7 +20,8 @@ public class ProtocolConstants @@ -19,7 +19,8 @@ public class ProtocolConstants
"1.10.x", "1.10.x",
"1.11.x" "1.11.x"
); );
@ -18,8 +18,8 @@ index 9929ef4..af80c95 100644
ProtocolConstants.MINECRAFT_1_9, ProtocolConstants.MINECRAFT_1_9,
ProtocolConstants.MINECRAFT_1_9_1, ProtocolConstants.MINECRAFT_1_9_1,
ProtocolConstants.MINECRAFT_1_9_2, ProtocolConstants.MINECRAFT_1_9_2,
@@ -30,6 +31,16 @@ public class ProtocolConstants @@ -28,6 +29,16 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_11_1 ProtocolConstants.MINECRAFT_1_11
); );
+ public static final boolean isBeforeOrEq(int before, int other) + public static final boolean isBeforeOrEq(int before, int other)
@ -36,5 +36,5 @@ index 9929ef4..af80c95 100644
{ {
-- --
2.7.4 2.7.4 (Apple Git-66)

1743
Waterfall-Proxy-Patches/0005-1.7.x-Protocol-Patch.patch
View File

File diff suppressed because it is too large Load Diff