Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-01-31 03:51:36 +01:00
Code Issues Projects Releases Wiki Activity

Add native macos DNS resolver

Browse Source
This commit is contained in:
Shane Freeder 2021-04-12 07:37:52 +01:00
parent 845580021b
commit 49605839bc
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BungeeCord-Patches/0033-Optionally-use-async-Netty-DNS-resolver.patch
View File

@ -1,4 +1,4 @@
From 5baa001a554607a1b2dd10e182e533c9b9e4d9cb Mon Sep 17 00:00:00 2001
From d1bbde9308d3535bd830daf15e230b03a121e043 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Wed, 21 Dec 2016 03:13:03 -0500
Subject: [PATCH] Optionally use async Netty DNS resolver
@ -24,10 +24,10 @@ index 749059ab..6141128b 100644
/**
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 15ce6884..56a83e68 100644
index f5610a53..31e172c7 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -36,6 +36,14 @@
@@ -36,6 +36,20 @@
<version>${netty.version}</version>
<scope>compile</scope>
</dependency>
@ -38,6 +38,12 @@ index 15ce6884..56a83e68 100644
+ <version>${netty.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver-dns-native-macos</artifactId>
+ <version>${netty.version}</version>
+ <classifier>osx-x86_64</classifier>
+ </dependency>
+ <!-- Waterfall End -->
<dependency>
<groupId>io.netty</groupId>
@ -171,5 +177,5 @@ index e0c52f21..37337429 100644
+ // Waterfall End
}
--
2.26.2
2.31.0

8
BungeeCord-Patches/0036-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

@ -1,4 +1,4 @@
From a2c4daae4702f17b028c5225ae0bf5cabe696e9d Mon Sep 17 00:00:00 2001
From 92b6a65c214965a5dd2422d1d4e78eeffb793d6f Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@ -245,10 +245,10 @@ index 12c285f2..56bb4a7a 100644
<module>protocol</module>
<module>proxy</module>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 97cb9e03..fef13cbf 100644
index 31e172c7..ca1fc13b 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -65,7 +65,7 @@
@@ -71,7 +71,7 @@
</dependency>
<dependency>
<groupId>io.github.waterfallmc</groupId>
@ -257,7 +257,7 @@ index 97cb9e03..fef13cbf 100644
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -124,6 +124,19 @@
@@ -130,6 +130,19 @@
<version>1.7.30</version>
<scope>compile</scope>
</dependency>