CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix disabled netty again

Browse Source
This commit is contained in:
md_5 2013-04-24 21:40:04 +10:00
parent 1619952f6d
commit 3dcab711e3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CraftBukkit-Patches/0020-Netty.patch
View File

@ -1,4 +1,4 @@
From 581d883c923294c725f719f2061591c9525d6565 Mon Sep 17 00:00:00 2001 From 2c3e391038bd13cd441a762e2800cec8b4aefea9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 23 Apr 2013 11:47:32 +1000 Date: Tue, 23 Apr 2013 11:47:32 +1000
Subject: [PATCH] Netty Subject: [PATCH] Netty
@ -74,7 +74,7 @@ index bd7e41c..b04d8a1 100644
this.getLogger().warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); this.getLogger().warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
this.getLogger().warning("The server will make no attempt to authenticate usernames. Beware."); this.getLogger().warning("The server will make no attempt to authenticate usernames. Beware.");
diff --git a/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java b/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java diff --git a/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java b/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java
index ef7e10d..4638983 100644 index ef7e10d..5f2e42e 100644
--- a/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java --- a/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java
+++ b/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java +++ b/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java
@@ -82,7 +82,7 @@ public class DedicatedServerConnectionThread extends Thread { @@ -82,7 +82,7 @@ public class DedicatedServerConnectionThread extends Thread {
@ -82,7 +82,7 @@ index ef7e10d..4638983 100644
PendingConnection pendingconnection = new PendingConnection(this.e.d(), socket, "Connection #" + this.c++); PendingConnection pendingconnection = new PendingConnection(this.e.d(), socket, "Connection #" + this.c++);
- this.a(pendingconnection); - this.a(pendingconnection);
+ ((org.spigotmc.MultiplexingServerConnection) this.e).register(pendingconnection); // Spigot + ((org.spigotmc.MultiplexingServerConnection) this.e.d().ae()).register(pendingconnection); // Spigot
} catch (IOException ioexception) { } catch (IOException ioexception) {
this.e.d().getLogger().warning("DSCT: " + ioexception.getMessage()); // CraftBukkit this.e.d().getLogger().warning("DSCT: " + ioexception.getMessage()); // CraftBukkit
} }