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

Update Spigot to Minecraft 1.6.2

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-07-09 10:31:10 +10:00
parent 0485474219
commit 6fe8638955
25 changed files with 140 additions and 421 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 ee34b94e8d33a76135afca40f9331fc1868e2300 Mon Sep 17 00:00:00 2001
From 18669c7ef82c128985c43f16d2fd0545a787871b 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 d1cc48d..69e596b 100644
index afe0225..4cffec7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,21 @@
@@ -31,7 +31,7 @@ index d1cc48d..69e596b 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 ddb32ac..ec3d104 100644
index 6fe33d0..fa02974 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
@@ -80,10 +80,10 @@ index 0000000..6fcc5d7
+ void setSocketAddress(java.net.SocketAddress address); // Spigot
+}
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index c60abf1..e1b259b 100644
index a2bdfa3..fd6acab 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -25,7 +25,7 @@ public class NetworkManager implements INetworkManager {
@@ -27,7 +27,7 @@ public class NetworkManager implements INetworkManager {
private final Object h = new Object();
private final IConsoleLogManager i;
public Socket socket; // CraftBukkit - private -> public
@@ -92,7 +92,7 @@ index c60abf1..e1b259b 100644
private volatile DataInputStream input;
private volatile DataOutputStream output;
private volatile boolean n = true;
@@ -370,4 +370,6 @@ public class NetworkManager implements INetworkManager {
@@ -374,4 +374,6 @@ public class NetworkManager implements INetworkManager {
static Thread h(NetworkManager networkmanager) {
return networkmanager.u;
}
@@ -100,7 +100,7 @@ index c60abf1..e1b259b 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 043321d..8b66470 100644
index c9e187e..b433c60 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 {