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

revert changes to disabled plugins and scheduler.

Browse Source 
sorry for messy commit,doing via tablet on ssh
md_5

By: Hudson <hudson@mydomain.com>
This commit is contained in:
Spigot
2013-04-03 02:20:29 -05:00
parent fcfb1b5cb0
commit 08676f42a0
52 changed files with 376 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
CraftBukkit-Patches/0027-Netty.patch
View File

@@ -1,4 +1,4 @@
From 02c3ccb6b9e24a0367962e7581015fc28fd5f053 Mon Sep 17 00:00:00 2001
From 625a5680d0be28a1caa3bd65d02703a41f321a45 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 14 Feb 2013 17:32:20 +1100
Subject: [PATCH] Netty
@@ -31,24 +31,24 @@ Subject: [PATCH] Netty
slight reduction in latency. This commit is licensed under the Creative
Commons Attribution-ShareAlike 3.0 Unported license.
---
pom.xml | 5 +
.../java/net/minecraft/server/DedicatedServer.java | 8 +-
.../java/net/minecraft/server/INetworkManager.java | 26 +++
.../java/net/minecraft/server/NetworkManager.java | 4 +-
.../net/minecraft/server/Packet51MapChunk.java | 2 +-
.../net/minecraft/server/Packet56MapChunkBulk.java | 2 +-
.../net/minecraft/server/PendingConnection.java | 11 +-
.../net/minecraft/server/ThreadCommandReader.java | 1 +
.../net/minecraft/server/ThreadLoginVerifier.java | 1 +
.../craftbukkit/scheduler/CraftScheduler.java | 2 +-
src/main/java/org/spigotmc/netty/CipherCodec.java | 49 ++++
.../org/spigotmc/netty/NettyNetworkManager.java | 235 +++++++++++++++++++
.../org/spigotmc/netty/NettyServerConnection.java | 109 +++++++++
.../org/spigotmc/netty/NettySocketAdaptor.java | 248 +++++++++++++++++++++
.../java/org/spigotmc/netty/PacketDecoder.java | 64 ++++++
.../java/org/spigotmc/netty/PacketEncoder.java | 43 ++++
.../java/org/spigotmc/netty/PacketListener.java | 100 +++++++++
src/main/java/org/spigotmc/netty/ReadState.java | 16 ++
pom.xml | 5 +
.../java/net/minecraft/server/DedicatedServer.java | 8 +-
.../java/net/minecraft/server/INetworkManager.java | 26 ++
.../java/net/minecraft/server/NetworkManager.java | 4 +-
.../net/minecraft/server/Packet51MapChunk.java | 2 +-
.../net/minecraft/server/Packet56MapChunkBulk.java | 2 +-
.../net/minecraft/server/PendingConnection.java | 11 +-
.../net/minecraft/server/ThreadCommandReader.java | 1 +
.../net/minecraft/server/ThreadLoginVerifier.java | 1 +
.../craftbukkit/scheduler/CraftScheduler.java | 2 +-
src/main/java/org/spigotmc/netty/CipherCodec.java | 49 ++++
.../org/spigotmc/netty/NettyNetworkManager.java | 235 +++++++++++++++++++
.../org/spigotmc/netty/NettyServerConnection.java | 109 +++++++++
.../org/spigotmc/netty/NettySocketAdaptor.java | 248 ++++++++++++++++++++
.../java/org/spigotmc/netty/PacketDecoder.java | 64 +++++
.../java/org/spigotmc/netty/PacketEncoder.java | 43 ++++
.../java/org/spigotmc/netty/PacketListener.java | 100 ++++++++
src/main/java/org/spigotmc/netty/ReadState.java | 16 ++
18 files changed, 917 insertions(+), 9 deletions(-)
create mode 100644 src/main/java/net/minecraft/server/INetworkManager.java
create mode 100644 src/main/java/org/spigotmc/netty/CipherCodec.java
@@ -244,10 +244,10 @@ index c185f64..abe0b81 100644
// CraftBukkit end
this.pendingConnection = pendingconnection;
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index 0a5c61a..35badf3 100644
index 84dcfcc..a30f217 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -70,7 +70,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -71,7 +71,7 @@ public class CraftScheduler implements BukkitScheduler {
*/
private final ConcurrentHashMap<Integer, CraftTask> runners = new ConcurrentHashMap<Integer, CraftTask>();
private volatile int currentTick = -1;
@@ -1169,5 +1169,5 @@ index 0000000..5dc3754
+ DATA;
+}
--
1.8.1-rc2
1.7.0.4