Waterfall/Waterfall-Proxy-Patches/0004-Fixup-ProtocolConstants.patch
Techcable 7b902eb14f
Wiggle the patches to resolve conflicts
For some reason, this doesn't build on my computer because of an issue
with OpenSSL.

Fixes #43
2017-05-15 00:01:52 -07:00

41 lines
1.4 KiB
Diff

From c3740870ca9b540e1e6bda48a629c50378557946 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 57b0cd3c..743556c7 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
@@ -22,7 +22,8 @@ public class ProtocolConstants
"1.11.x",
"1.12.x"
);
- public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList( ProtocolConstants.MINECRAFT_1_8,
+ public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList(
+ ProtocolConstants.MINECRAFT_1_8,
ProtocolConstants.MINECRAFT_1_9,
ProtocolConstants.MINECRAFT_1_9_1,
ProtocolConstants.MINECRAFT_1_9_2,
@@ -33,6 +34,16 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_12
);
+ public static final boolean isBeforeOrEq(int before, int other)
+ {
+ return before <= other;
+ }
+
+ public static final boolean isAfterOrEq(int after, int other)
+ {
+ return after >= other;
+ }
+
public enum Direction
{
--
2.12.2