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

Update to CraftBukkit 1.6.4

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-09-20 11:46:45 +10:00
parent 759d56f0fb
commit d0f0d605bf
26 changed files with 129 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From edc58f74c709f3ad2c2a8ec96dcb518aa5e6a3fd Mon Sep 17 00:00:00 2001
From 45291669fd55e2a6d13274ec194ba9d7454385f3 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 ac0d198..db54e95 100644
index c155913..3ca28d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,21 @@
@@ -31,10 +31,10 @@ index ac0d198..db54e95 100644
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 6fe33d0..fa02974 100644
index 0cca057..4759f6a 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -100,7 +100,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -101,7 +101,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
this.getLogger().info("Starting Minecraft server on " + (this.getServerIp().length() == 0 ? "*" : this.getServerIp()) + ":" + this.I());
try {
@@ -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 1749059..7f2c1a9 100644
index 1bb77a9..f48d4a9 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 1749059..7f2c1a9 100644
}
// CraftBukkit start
@@ -149,7 +154,7 @@ public class PendingConnection extends Connection {
@@ -147,7 +152,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 1749059..7f2c1a9 100644
// CraftBukkit
s = pingEvent.getMotd() + "\u00A7" + playerlist.getPlayerCount() + "\u00A7" + pingEvent.getMaxPlayers();
} else {
@@ -178,9 +183,18 @@ public class PendingConnection extends Connection {
@@ -176,9 +181,18 @@ public class PendingConnection extends Connection {
this.networkManager.queue(new Packet255KickDisconnect(s));
this.networkManager.d();