Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-09-27 22:17:57 +02:00
Code Issues Projects Releases Wiki Activity

Remove newlines I didn't spot earlier

Browse Source
This commit is contained in:
Jamie Mansfield 2016-12-09 23:54:35 +00:00
parent 1d815c9bb9
commit d8d9dc852a
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
4 changed files with 27 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
BungeeCord-Patches/0011-Optimize-uuid-conversions.patch
View File

@ -1,4 +1,4 @@
From 59f7e0021b2116919e0b3b8a2fba1a005a6640b6 Mon Sep 17 00:00:00 2001
From 443adb7224757f0011a64b8e4a644af493d97c97 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Mon, 14 Mar 2016 15:40:44 -0700
Subject: [PATCH] Optimize uuid conversions
@ -8,7 +8,7 @@ Manually decode uuids to and from hex.
diff --git a/api/src/main/java/io/github/waterfallmc/waterfall/utils/Hex.java b/api/src/main/java/io/github/waterfallmc/waterfall/utils/Hex.java
new file mode 100644
index 00000000..ece5f798
index 0000000..ece5f79
--- /dev/null
+++ b/api/src/main/java/io/github/waterfallmc/waterfall/utils/Hex.java
@@ -0,0 +1,113 @@
@ -128,7 +128,7 @@ index 00000000..ece5f798
\ No newline at end of file
diff --git a/api/src/main/java/io/github/waterfallmc/waterfall/utils/UUIDUtils.java b/api/src/main/java/io/github/waterfallmc/waterfall/utils/UUIDUtils.java
new file mode 100644
index 00000000..cc24dd35
index 0000000..cc24dd3
--- /dev/null
+++ b/api/src/main/java/io/github/waterfallmc/waterfall/utils/UUIDUtils.java
@@ -0,0 +1,74 @@
@ -208,7 +208,7 @@ index 00000000..cc24dd35
+}
\ No newline at end of file
diff --git a/api/src/main/java/net/md_5/bungee/Util.java b/api/src/main/java/net/md_5/bungee/Util.java
index 86a00555..6c9c6d61 100644
index 86a0055..6c9c6d6 100644
--- a/api/src/main/java/net/md_5/bungee/Util.java
+++ b/api/src/main/java/net/md_5/bungee/Util.java
@@ -1,11 +1,15 @@
@ -245,18 +245,10 @@ index 86a00555..6c9c6d61 100644
}
}
diff --git a/api/src/main/java/net/md_5/bungee/api/ServerPing.java b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
index 27b51849..5320ae0b 100644
index 27b5184..8bf17f9 100644
--- a/api/src/main/java/net/md_5/bungee/api/ServerPing.java
+++ b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
@@ -3,6 +3,7 @@ package net.md_5.bungee.api;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.Getter;
@@ -75,7 +76,7 @@ public class ServerPing
@@ -75,7 +75,7 @@ public class ServerPing
public String getId()
{
@ -266,18 +258,10 @@ index 27b51849..5320ae0b 100644
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index d87b03c0..e0b77838 100644
index d87b03c..3c33b5b 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -12,6 +12,7 @@ import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import javax.crypto.SecretKey;
+
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.BungeeCord;
@@ -603,7 +604,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -603,7 +603,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String getUUID()
{
@ -287,5 +271,5 @@ index d87b03c0..e0b77838 100644
@Override
--
2.11.0.windows.1
2.10.0

20
BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch
View File

@ -1,4 +1,4 @@
From 7665abb83cc9c5291e61924a47118bdfc18fc821 Mon Sep 17 00:00:00 2001
From 30c3351f48c0aef697e237a476771268e42e3231 Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de>
Date: Sat, 12 Dec 2015 23:43:30 +0100
Subject: [PATCH] Optional server list ping logging.
@ -9,7 +9,7 @@ This avoids spamming the logs with connection notices.
Server list pings are only logged if the log_server_list_pings config.yml option is true, defaults to false
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
index 66d0b8a1..5a49050a 100644
index 66d0b8a..5a49050 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
@@ -89,6 +89,11 @@ public interface ProxyConfig
@ -25,7 +25,7 @@ index 66d0b8a1..5a49050a 100644
/**
diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
index e56d3591..68f25460 100644
index e56d359..68f2546 100644
--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
@@ -16,6 +16,13 @@ public class WaterfallConfiguration extends Configuration {
@ -61,7 +61,7 @@ index e56d3591..68f25460 100644
+ }
}
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index ed057b8a..a37f3ea3 100644
index ed057b8..a37f3ea 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -382,6 +382,6 @@ public class ServerConnector extends PacketHandler
@ -73,7 +73,7 @@ index ed057b8a..a37f3ea3 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index ce32f6b1..470f0bef 100644
index ce32f6b..470f0be 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -510,6 +510,6 @@ public class DownstreamBridge extends PacketHandler
@ -85,10 +85,10 @@ index ce32f6b1..470f0bef 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index e0b77838..f11643ab 100644
index 3c33b5b..90b27c0 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -282,19 +282,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -281,19 +281,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
this.virtualHost = InetSocketAddress.createUnresolved( handshake.getHost(), handshake.getPort() );
@ -112,7 +112,7 @@ index e0b77838..f11643ab 100644
thisState = State.USERNAME;
ch.setProtocol( Protocol.LOGIN );
@@ -610,7 +613,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -609,7 +612,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String toString()
{
@ -122,7 +122,7 @@ index e0b77838..f11643ab 100644
@Override
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index 654be214..618e76e3 100644
index 654be21..618e76e 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -213,6 +213,6 @@ public class UpstreamBridge extends PacketHandler
@ -134,5 +134,5 @@ index 654be214..618e76e3 100644
}
}
--
2.11.0.windows.1
2.10.0

8
BungeeCord-Patches/0024-Add-a-property-to-accept-invalid-ping-packets.patch
View File

@ -1,4 +1,4 @@
From a0648fde5463784940996efbce228a5fa1736173 Mon Sep 17 00:00:00 2001
From 6a3c1b34836f5e7c148839a630ac8f416394284e Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Sun, 7 Feb 2016 00:01:19 -0700
Subject: [PATCH] Add a property to accept invalid ping packets
@ -9,10 +9,10 @@ You can enable it by setting '-Dwaterfall.acceptInvalidPackets=true' at the comm
Fixes #23
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index f11643ab..c7de8fa4 100644
index 90b27c0..f18ab46 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -248,10 +248,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -247,10 +247,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
thisState = State.PING;
}
@ -29,5 +29,5 @@ index f11643ab..c7de8fa4 100644
disconnect( "" );
}
--
2.11.0.windows.1
2.10.0

8
BungeeCord-Patches/0033-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch
View File

@ -1,14 +1,14 @@
From e1616d2c0ed2af4e84417cbcce68ba0b3609c74c Mon Sep 17 00:00:00 2001
From 8b9b91fa1167cef1ae3ee78dd06e94125ebb64dc Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Mon, 6 Jun 2016 13:36:10 -0600
Subject: [PATCH] Don't send KICK packets while in HANDSHAKE state
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index c7de8fa4..9a2c94bb 100644
index f18ab46..88bc825 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -552,7 +552,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -551,7 +551,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public void run()
{
@ -18,5 +18,5 @@ index c7de8fa4..9a2c94bb 100644
unsafe().sendPacket( new Kick( ComponentSerializer.toString( reason ) ) );
}
--
2.11.0.windows.1
2.10.0