diff options
| author | Nassim Jahnke <[email protected]> | 2022-02-28 22:43:03 -0700 |
|---|---|---|
| committer | Jason Penilla <[email protected]> | 2022-02-28 22:52:35 -0700 |
| commit | c2e2281f292f2e9b102d3074c6cb9efdb4e5cfc2 (patch) | |
| tree | 27af461cbd2598f66f1bc9bd8ccdb678bf15f6f6 /patches/server/0660-Add-Unix-domain-socket-support.patch | |
| parent | 30cb7d0407bfb01a3bc0cc2da1dc0af32dfae5a4 (diff) | |
| download | Paper-c2e2281f292f2e9b102d3074c6cb9efdb4e5cfc2.tar.gz Paper-c2e2281f292f2e9b102d3074c6cb9efdb4e5cfc2.zip | |
Initial 1.18 update
Diffstat (limited to 'patches/server/0660-Add-Unix-domain-socket-support.patch')
| -rw-r--r-- | patches/server/0660-Add-Unix-domain-socket-support.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/server/0660-Add-Unix-domain-socket-support.patch b/patches/server/0660-Add-Unix-domain-socket-support.patch index 5c0940448b..6c525d4255 100644 --- a/patches/server/0660-Add-Unix-domain-socket-support.patch +++ b/patches/server/0660-Add-Unix-domain-socket-support.patch @@ -11,10 +11,10 @@ Tested-by: Mariell Hoversholm <[email protected]> Reviewed-by: Mariell Hoversholm <[email protected]> diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java -index ea7444d5d242e15fe3fb1d87ddb98f3074d3e979..2a9d5d977932e63ff7cae2fb8a7cfe7860172a39 100644 +index 932b494ea2a5e849b233c73bd2472d5c85f5ba52..8536dd544876e245a611379a7ed1446b0ed06eac 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java -@@ -614,6 +614,11 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> { +@@ -626,6 +626,11 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> { // Spigot Start public SocketAddress getRawAddress() { @@ -27,10 +27,10 @@ index ea7444d5d242e15fe3fb1d87ddb98f3074d3e979..2a9d5d977932e63ff7cae2fb8a7cfe78 } // Spigot End diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 331c85d236922d7a4b5732cb09aa708830e1393c..82cee660a029547eda8abdf4188b9d1fb4ba0d53 100644 +index fa6adf12e8272c90c3376bc93350dc57eb1cd461..12020ec70e47499962ad19d03c89da8e2891536e 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -231,6 +231,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -234,6 +234,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface this.setEnforceWhitelist(dedicatedserverproperties.enforceWhitelist); // this.worldData.setGameType(dedicatedserverproperties.gamemode); // CraftBukkit - moved to world loading DedicatedServer.LOGGER.info("Default game type: {}", dedicatedserverproperties.gamemode); @@ -51,7 +51,7 @@ index 331c85d236922d7a4b5732cb09aa708830e1393c..82cee660a029547eda8abdf4188b9d1f InetAddress inetaddress = null; if (!this.getLocalIp().isEmpty()) { -@@ -240,12 +254,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -243,12 +257,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface if (this.getPort() < 0) { this.setPort(dedicatedserverproperties.serverPort); } @@ -69,7 +69,7 @@ index 331c85d236922d7a4b5732cb09aa708830e1393c..82cee660a029547eda8abdf4188b9d1f DedicatedServer.LOGGER.warn("**** FAILED TO BIND TO PORT!"); DedicatedServer.LOGGER.warn("The exception was: {}", ioexception.toString()); diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java -index 3d78b1f06839fa6534c84979a32bb80ec5de6d84..70b0c7fea72397f7bbdf02ce2794e7fb6fbd3742 100644 +index c36089ead51d2e7dc3369d5f9a1869f58ff5391c..bfa519b9335c960a5baec50b0da95d95cd5ee958 100644 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java @@ -78,7 +78,12 @@ public class ServerConnectionListener { |