SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-09-21 13:39:32 +10:00
parent b9b50f31e2
commit 592cae8e3e
6 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0024-Netty.patch
View File

@@ -1,4 +1,4 @@
From 45291669fd55e2a6d13274ec194ba9d7454385f3 Mon Sep 17 00:00:00 2001
From d4c1e16d482be2abb1bf40a1afeb6f958fca4b84 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 09:06:29 +1000
Subject: [PATCH] Netty
@@ -100,7 +100,7 @@ index a2bdfa3..fd6acab 100644
+ public void setSocketAddress(SocketAddress address) { k = address; } // Spigot
}
diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
index 1bb77a9..f48d4a9 100644
index 2a96168..6ffc927 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java
@@ -16,7 +16,7 @@ public class PendingConnection extends Connection {
@@ -129,7 +129,7 @@ index 1bb77a9..f48d4a9 100644
}
// CraftBukkit start
@@ -147,7 +152,7 @@ public class PendingConnection extends Connection {
@@ -148,7 +153,7 @@ public class PendingConnection extends Connection {
String s = null;
// CraftBukkit
org.bukkit.event.server.ServerListPingEvent pingEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callServerListPingEvent(this.server.server, getSocket().getInetAddress(), this.server.getMotd(), playerlist.getPlayerCount(), playerlist.getMaxPlayers());
@@ -138,7 +138,7 @@ index 1bb77a9..f48d4a9 100644
// CraftBukkit
s = pingEvent.getMotd() + "\u00A7" + playerlist.getPlayerCount() + "\u00A7" + pingEvent.getMaxPlayers();
} else {
@@ -176,9 +181,18 @@ public class PendingConnection extends Connection {
@@ -177,9 +182,18 @@ public class PendingConnection extends Connection {
this.networkManager.queue(new Packet255KickDisconnect(s));
this.networkManager.d();