From ea1a909c8055b63d9732934d90fae3be963e7f3a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 24 May 2020 13:07:53 -0400
Subject: [PATCH] Fix netty version to 50 and restore epoll native support

Accidently used the snapshot, as well as needed to exclude the
existing old 25 build of libnetty so that we load the newer build of
epoll instead.

Thanks to 56738 for the catch.
---
 Spigot-Server-Patches/0001-POM-Changes.patch | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index 6d7760c63f..520ca9eb46 100644
--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 9fc92e347f24a0210a9190513e93cba3b6772557..aec55b0b78fa47d427652d402cfbb61295672b11 100644
+index 9fc92e347f24a0210a9190513e93cba3b6772557..3554314526b3f33ad02df2adfd42d45118d75526 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,15 +1,14 @@
@@ -68,7 +68,7 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..aec55b0b78fa47d427652d402cfbb612
 +        <dependency>
 +            <groupId>io.netty</groupId>
 +            <artifactId>netty-all</artifactId>
-+            <version>4.1.51.Final-SNAPSHOT</version>
++            <version>4.1.50.Final</version>
 +        </dependency>
          <!-- deprecated API depend -->
          <dependency>
@@ -147,12 +147,13 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..aec55b0b78fa47d427652d402cfbb612
                              <createSourcesJar>${shadeSourcesJar}</createSourcesJar>
                              <filters>
                                  <filter>
-@@ -198,6 +205,13 @@
+@@ -198,6 +205,14 @@
                                          <exclude>com/google/common/**</exclude>
                                          <exclude>com/google/gson/**</exclude>
                                          <exclude>com/google/thirdparty/**</exclude>
 +                                        <!-- paper -->
 +                                        <exclude>io/netty/**</exclude>
++                                        <exclude>META-INF/native/libnetty*</exclude>
 +                                        <exclude>com/brigadier/**</exclude>
 +                                        <exclude>META-INF/MANIFEST.MF</exclude>
 +                                        <exclude>com.mojang.authlib.yggdrasil.YggdrasilGameProfileRepository</exclude>
@@ -161,7 +162,7 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..aec55b0b78fa47d427652d402cfbb612
                                      </excludes>
                                  </filter>
                              </filters>
-@@ -213,10 +227,11 @@
+@@ -213,10 +228,11 @@
                                      <pattern>jline</pattern>
                                      <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
                                  </relocation>
@@ -177,7 +178,7 @@ index 9fc92e347f24a0210a9190513e93cba3b6772557..aec55b0b78fa47d427652d402cfbb612
                                  <relocation>
                                      <pattern>org.apache.commons.codec</pattern>
                                      <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.codec</shadedPattern>
-@@ -258,10 +273,6 @@
+@@ -258,10 +274,6 @@
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-compiler-plugin</artifactId>
                  <version>3.8.1</version>