core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update B/CB

This commit is contained in:
Shane Freeder 2017-10-09 10:15:17 +01:00
parent 5d722d4080
commit 599d18420d
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Spigot-Server-Patches/0242-handle-PacketPlayInKeepAlive-async-and-revert-keepal.patch
View File

@ -1,4 +1,4 @@
From 86f7060fad99e5d5efc34425c2e95e90ce59d109 Mon Sep 17 00:00:00 2001 From 0e86c660e9a4442f15351c28b2beb151d70af09f Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 5 Oct 2017 01:54:07 +0100 Date: Thu, 5 Oct 2017 01:54:07 +0100
Subject: [PATCH] handle PacketPlayInKeepAlive async and revert keepalive limit Subject: [PATCH] handle PacketPlayInKeepAlive async and revert keepalive limit
@ -16,19 +16,20 @@ this solves a read timeout in scenarios where the client isn't sending data to
the server, e.g. spectating an entity. the server, e.g. spectating an entity.
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 36af72387..b0ed57ba1 100644 index 69ed84af9..b18bf4245 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -181,7 +181,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -180,8 +180,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.minecraftServer.methodProfiler.a("keepAlive"); this.minecraftServer.methodProfiler.a("keepAlive");
long i = this.d(); long i = this.d();
-
- if (i - this.f >= 30000L) { // CraftBukkit - if (i - this.f >= 25000L) { // CraftBukkit
+ if (i - this.f >= 15000L) { // CraftBukkit // Paper - revert to 15 + if (i - this.f >= 15000L) { // CraftBukkit // Paper - revert to 15
if (this.g) { if (this.g) {
this.disconnect(new ChatMessage("disconnect.timeout", new Object[0])); this.disconnect(new ChatMessage("disconnect.timeout", new Object[0]));
} else { } else {
@@ -2225,14 +2225,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -2225,14 +2224,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
} }
public void a(PacketPlayInKeepAlive packetplayinkeepalive) { public void a(PacketPlayInKeepAlive packetplayinkeepalive) {

2
work/Bukkit

@ -1 +1 @@
Subproject commit 4f16bdbabbad82b6130b19bcc0a4621dee83e86e Subproject commit dcc4266e331ab53697ba0f56dc3027d2d691cf88

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit f8500c0a3ea5ecbefa9f8556a480e7fe4247ddbb Subproject commit 9ab758c7b608854ec658450227c2a17e51845de5