Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
9b0a0d8 Add the default tick rate of the sensor to the timings (#6242)
e905eb1 Add fireball to default max load config (#6252)
2f1f1b7 Add config option to specify timings url (#6256)
efd7e51 Move "use-display-name-in-quit-message" to settings namespace (#6257)
b32a3b1 Call EntityKnockbackByEntityEvent for RamTarget Behavior (#6273)
This commit is contained in:
William Blake Galbreath
2021-07-26 21:41:58 -05:00
parent f482d19d56
commit b2056c256f
28 changed files with 100 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0022-Alternative-Keepalive-Handling.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 3bd3cb3011e95f5c8123209e37034d7e4224fd47..b9fc450c548e20d1f9763d993f3818235bec4bdb 100644
index 858a0402a22e3c52d88b976bb513d0f82a60d114..4bc387482dfcecea079257e65e933ecd78951adc 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -228,6 +228,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -56,10 +56,10 @@ index 3bd3cb3011e95f5c8123209e37034d7e4224fd47..b9fc450c548e20d1f9763d993f381823
if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
int i = (int) (Util.getMillis() - this.keepAliveTime);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index e027b5a2d0cc094c0cac2c1ca16e3d9693374384..403c996c44b9afbc4236966940f39ca51a476e3d 100644
index dd9fca23e1f96ad261589d9b66d4306a228ec76a..2175b355c9c05bec3cac9d9f392a4992261ff63e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -186,6 +186,11 @@ public class PurpurConfig {
@@ -193,6 +193,11 @@ public class PurpurConfig {
laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
}