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:
PaperMC/Paper@8bc0574 Bump kyori's ansi to fix color bleed (#9346)
PaperMC/Paper@f7b386d Use ANSI serializer for console completion descriptions (#9351)
PaperMC/Paper@41e6f20 Updated Upstream (Bukkit/CraftBukkit) (#9342)
PaperMC/Paper@b134eb4 Fix incorrect annotation on BrushableBlock#getItem (#9345)
PaperMC/Paper@fa674f3 Don't enforce icanhasbukkit default if alias block exists (#9334)
PaperMC/Paper@81834ac Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@f6139de Fix sniffer removeExploredLocation and javadoc (#9311)
PaperMC/Paper@17966dd Update the server logo (#9264)
PaperMC/Paper@02e3b5a chore(api): add missing javadoc urls (#9355)
PaperMC/Paper@3f237e8 Fix IntegerUtil#getDivisorNumbers
PaperMC/Paper@f555138 Make sure to post process chunks before they are sent to players
PaperMC/Paper@a226f44 Copy itemstack when sanitizing for datawatcher items
PaperMC/Paper@3885666 Remove stacktrace on exception from reading server.properties (#9296)
This commit is contained in:
Ben Kerllenevich
2023-06-17 09:33:51 -04:00
parent 2e5dcc63d3
commit fa3166a24d
23 changed files with 388 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0016-Lagging-threshold.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index bd474cebc35219c62fd667799e5467eea60c08da..9abd0167f644194367fab679f878c0288758d898 100644
index a9d635e3c6dd889ed816e8a6a7375eef5025dd42..7196ba603ae88c044854859f330487705dcb0d0c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -307,6 +307,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -25,10 +25,10 @@ index bd474cebc35219c62fd667799e5467eea60c08da..9abd0167f644194367fab679f878c028
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9f8300313465bef8f356961dde9d9cee870561c2..1f04aaf7fc459f5c8aea5ade4120328b3e8a90d3 100644
index 2d15e34720860d8f5d7922dfcad14ef3449a17ce..63a1f7f657d86860be2ee3619998d80e9e3b9236 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3015,5 +3015,10 @@ public final class CraftServer implements Server {
@@ -3019,5 +3019,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}