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-08 08:36:30 +10:00
parent e7e8fa87a5
commit aecf382223
25 changed files with 69 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From ca578c41828399b4afcf18296186814d213d1958 Mon Sep 17 00:00:00 2001
From b3c7421c34b7679656618b03581a7ff21881b70c 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
diff --git a/pom.xml b/pom.xml
index 0e6c422..401dd2d 100644
index ac0d198..bd5ff9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,21 @@
@@ -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 c9e187e..b433c60 100644
index 1749059..7f2c1a9 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 c9e187e..b433c60 100644
}
// CraftBukkit start
@@ -146,7 +151,7 @@ public class PendingConnection extends Connection {
@@ -149,7 +154,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 c9e187e..b433c60 100644
// CraftBukkit
s = pingEvent.getMotd() + "\u00A7" + playerlist.getPlayerCount() + "\u00A7" + pingEvent.getMaxPlayers();
} else {
@@ -175,9 +180,18 @@ public class PendingConnection extends Connection {
@@ -178,9 +183,18 @@ public class PendingConnection extends Connection {
this.networkManager.queue(new Packet255KickDisconnect(s));
this.networkManager.d();
@@ -160,7 +160,7 @@ index c9e187e..b433c60 100644
this.b = true;
} catch (Exception exception) {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index a9db856..7c39d34 100644
index 8499c7f..e5a09b3 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -6,6 +6,8 @@ import java.io.IOException;