Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +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:
PaperMC/Paper@a0b59ca [ci skip] Update paperweight to 1.4.1
PaperMC/Paper@035f9d7 Fix items never falling after being on ground (#8768)
PaperMC/Paper@214a8c5 Use single player info update packet on join (#8773)
This commit is contained in:
Encode42
2023-01-08 22:04:14 -05:00
parent 9b9dbeec08
commit 2f8ae1bc6d
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0278-Remove-Timings.patch
View File

@@ -656,7 +656,7 @@ index 077ff3d7620e3c48aca59a92014dbdb7de15e79a..ece55efcd566bcb9b06d305496ab7458
} else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 211a5660547f3fc994d6e74832d47263a93e9e4a..e57ef9c60163d8ee13547d87169ccd0daec4acd4 100644
index 6709f4647cd3f917b9cc6d44a59edcb1a9d6b258..44343b433dc18649e10980c83b155d84adeeee05 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2577,7 +2577,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -687,10 +687,10 @@ index 211a5660547f3fc994d6e74832d47263a93e9e4a..e57ef9c60163d8ee13547d87169ccd0d
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 728fcabab244bb1e5731349ad75a4556266b1bc8..c38acf2f364ed64b8ab1f4a8ef3b270c49e9fbdb 100644
index 47a2c5eb799580501f5b31c85a569fa342646d8b..b0fa557e756d1e30097ad5a72e679d8844b34cd9 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1220,7 +1220,7 @@ public abstract class PlayerList {
@@ -1226,7 +1226,7 @@ public abstract class PlayerList {
public void saveAll(int interval) {
io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
@@ -699,7 +699,7 @@ index 728fcabab244bb1e5731349ad75a4556266b1bc8..c38acf2f364ed64b8ab1f4a8ef3b270c
int numSaved = 0;
long now = MinecraftServer.currentTick;
for (int i = 0; i < this.players.size(); ++i) {
@@ -1231,7 +1231,7 @@ public abstract class PlayerList {
@@ -1237,7 +1237,7 @@ public abstract class PlayerList {
}
// Paper end
}
@@ -929,7 +929,7 @@ index 138407c2d4b0bc55ddb9aac5d2aa3edadda090fb..a6e9e503a496c18e2501b03ec84f4600
// Paper end - add timings for scoreboard search
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 383a13a26ee9445fa6201770bb9bef274d72283a..fe830a419c81811f0a72add63a3f09a94392e4a7 100644
index 00744aceb25ddc689b8c5ed90ae27e1ea28057ad..665625c69b93a2568b1f2218a0db39da435d8c99 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -170,7 +170,7 @@ public class ActivationRange