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 appears to apply and compile correctly

Paper Changes:
a6a197b1 Bump API ASM version to follow server
5ab48ad9 Fix commodore (#3264)
87e7ee7e Improve Async Login to avoid firing in middle of Entity Ticking
This commit is contained in:
William Blake Galbreath
2020-05-01 14:35:02 -05:00
parent 2e50cb0eed
commit f94d5bfe59
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 8ce3dd5f71...a6a197b11f

2
current-paper
View File

@@ -1 +1 @@
1.15.2--c9e081d4d8646f1eaaa1af769caf0a183a2df4b2
1.15.2--484b6419239f44b97883dcc4b5885205749afa74

6
patches/server/0031-Signs-allow-color-codes.patch
View File

@@ -1,4 +1,4 @@
From 568d19020fef0517534ac04e78c4c28e6eff977b Mon Sep 17 00:00:00 2001
From 77a11eb46e61acf65386735d5e4f30e403e53b40 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Signs allow color codes
@@ -23,10 +23,10 @@ index db54bcc7e..192ec4378 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index fb5cd5822..1a6cb78c5 100644
index 38ec22f4c..940acf07c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2588,6 +2588,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2599,6 +2599,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}
// Paper end

10
patches/server/0037-Implement-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From e0d27800ad2634b7b2dc0ed66dca4b664c9fe5d6 Mon Sep 17 00:00:00 2001
From edfef3a8ba11f70379845c75a0afe5caa89b4432 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] Implement AFK API
@@ -171,10 +171,10 @@ index 1398c47a2..0bf1a14b7 100644
public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
double d4 = d3 * d3;
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 1a6cb78c5..80770d1ef 100644
index 940acf07c..68ec9b5f3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -224,6 +224,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -235,6 +235,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
if (this.player.F() > 0L && this.minecraftServer.getIdleTimeout() > 0 && SystemUtils.getMonotonicMillis() - this.player.F() > (long) (this.minecraftServer.getIdleTimeout() * 1000 * 60)) {
@@ -187,7 +187,7 @@ index 1a6cb78c5..80770d1ef 100644
this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
this.disconnect(new ChatMessage("multiplayer.disconnect.idling", new Object[0]));
}
@@ -440,6 +446,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -451,6 +457,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -196,7 +196,7 @@ index 1a6cb78c5..80770d1ef 100644
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1109,6 +1117,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1120,6 +1128,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();

10
patches/server/0060-Alternative-Keepalive-Handling.patch
View File

@@ -1,4 +1,4 @@
From 39c3398fb9691aab354511301752d4f14a22c399 Mon Sep 17 00:00:00 2001
From bb274a1b8e9b969f078a8f4c99853e23e57be53a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 11 Oct 2019 00:17:39 -0500
Subject: [PATCH] Alternative Keepalive Handling
@@ -22,10 +22,10 @@ index 8e93f1540..470f92c4f 100644
return this.a;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 80770d1ef..d6e24f41e 100644
index 68ec9b5f3..9c380f87d 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -74,6 +74,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -75,6 +75,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
private long lastKeepAlive = SystemUtils.getMonotonicMillis(); private void setLastPing(long lastPing) { this.lastKeepAlive = lastPing;}; private long getLastPing() { return this.lastKeepAlive;}; // Paper - OBFHELPER
private boolean awaitingKeepAlive; private void setPendingPing(boolean isPending) { this.awaitingKeepAlive = isPending;}; private boolean isPendingPing() { return this.awaitingKeepAlive;}; // Paper - OBFHELPER
private long h; private void setKeepAliveID(long keepAliveID) { this.h = keepAliveID;}; private long getKeepAliveID() {return this.h; }; // Paper - OBFHELPER
@@ -33,7 +33,7 @@ index 80770d1ef..d6e24f41e 100644
// CraftBukkit start - multithreaded fields
private volatile int chatThrottle;
private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle");
@@ -192,6 +193,21 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -203,6 +204,21 @@ public class PlayerConnection implements PacketListenerPlayIn {
long currentTime = SystemUtils.getMonotonicMillis();
long elapsedTime = currentTime - this.getLastPing();
@@ -55,7 +55,7 @@ index 80770d1ef..d6e24f41e 100644
if (this.isPendingPing()) {
if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info
@@ -2625,6 +2641,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2636,6 +2652,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
@Override
public void a(PacketPlayInKeepAlive packetplayinkeepalive) {

6
patches/server/0082-Add-permission-for-F3-N-debug.patch
View File

@@ -1,4 +1,4 @@
From 60c4508cd2034759e296bf8ba858b41aa3d000ee Mon Sep 17 00:00:00 2001
From db022ecbbae92bbacaf3e880d56313d3cbf8807d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 28 Dec 2019 04:21:54 -0600
Subject: [PATCH] Add permission for F3+N debug
@@ -8,10 +8,10 @@ Subject: [PATCH] Add permission for F3+N debug
1 file changed, 1 insertion(+)
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index eaba3cbf0..8178fa960 100644
index edf9df8c8..642160065 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -969,6 +969,7 @@ public abstract class PlayerList {
@@ -973,6 +973,7 @@ public abstract class PlayerList {
} else {
b0 = (byte) (24 + i);
}