Actually fix the patches

This commit is contained in:
Tux 2017-01-04 20:07:36 -05:00
parent 8ed5f195a6
commit 5d52e0f653
3 changed files with 1348 additions and 22 deletions

View File

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

View File

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

File diff suppressed because it is too large Load Diff