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

Update to latest upstream

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-05-04 09:24:15 +10:00
parent d8b3cd4a33
commit 326c461585
25 changed files with 74 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 34aed5c5ebcedb2e9f2febe7f9bca1b41088c3d7 Mon Sep 17 00:00:00 2001
From 1f308c0c10df4f1a1533de497d1ef098bb64b348 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 23 Apr 2013 11:47:32 +1000
Subject: [PATCH] Netty
@@ -32,7 +32,7 @@ Subject: [PATCH] Netty
Commons Attribution-ShareAlike 3.0 Unported license.
diff --git a/pom.xml b/pom.xml
index 3c6062e..db5a904 100644
index 274fd43..b0891ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,11 @@
@@ -218,10 +218,10 @@ index 17cfacc..a945892 100644
this.b = true;
} catch (Exception exception) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 20d38b4..f7ec7bb 100644
index 767f3c3..028e7dd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1372,4 +1372,20 @@ public final class CraftServer implements Server {
@@ -1375,4 +1375,20 @@ public final class CraftServer implements Server {
public CraftScoreboardManager getScoreboardManager() {
return scoreboardManager;
}
@@ -1049,7 +1049,7 @@ index 0000000..a3b86b8
+}
diff --git a/src/main/java/org/spigotmc/netty/OutboundManager.java b/src/main/java/org/spigotmc/netty/OutboundManager.java
new file mode 100644
index 0000000..80205ed
index 0000000..1961e89
--- /dev/null
+++ b/src/main/java/org/spigotmc/netty/OutboundManager.java
@@ -0,0 +1,18 @@
@@ -1061,7 +1061,7 @@ index 0000000..80205ed
+
+public class OutboundManager extends ChannelOperationHandlerAdapter {
+
+ private static final int FLUSH_TIME = 10;
+ private static final int FLUSH_TIME = 5;
+ private long lastFlush;
+
+ public void flush(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {