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 & Pufferfish)

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

Paper Changes:
PaperMC/Paper@ec3cfa9 Only create paper.yml-README.txt on config conversion (#8334)
PaperMC/Paper@928bcc8 Updated Upstream (Bukkit/CraftBukkit) (#8430)
PaperMC/Paper@616db71 Fix nothing mlg (#8432)
PaperMC/Paper@011caa4 [ci skip] Minor patch cleanup
PaperMC/Paper@15e1748 Avoid resizing of ArrayList in ChunkMap#getPlayers (#8416)
PaperMC/Paper@ad3d357 Remove unnecessary onTrackingStart during nav warning
PaperMC/Paper@9d63b07 Fix custom piglin interest items (#8097)
PaperMC/Paper@ff67f1f EntityPickupItemEvent fixes (#8096)

Pufferfish Changes:
pufferfish-gg/Pufferfish@08aeb1a Updated Upstream (Paper)
pufferfish-gg/Pufferfish@58865aa Updated Upstream (Paper)
pufferfish-gg/Pufferfish@d960687 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@9d9a0e1 Update snakeyaml dependency
This commit is contained in:
BillyGalbreath
2022-10-05 04:26:13 -05:00
parent b54122adf4
commit f5ae75874a
31 changed files with 140 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
patches/server/0002-Fix-pufferfish-issues.patch
View File

@@ -4,21 +4,6 @@ Date: Sun, 12 Jun 2022 09:18:57 -0500
Subject: [PATCH] Fix pufferfish issues
diff --git a/build.gradle.kts b/build.gradle.kts
index 0485d126f799789b5d5abcaf96da96df25a12dfd..692789a473665c1fc7be56b8913cd208ae27d2e5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -49,8 +49,8 @@ dependencies {
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
// Pufferfish start
- implementation("org.yaml:snakeyaml:1.30")
- implementation ("me.carleslc.Simple-YAML:Simple-Yaml:1.8") {
+ implementation("org.yaml:snakeyaml:1.32")// Purpur
+ implementation ("me.carleslc.Simple-YAML:Simple-Yaml:1.8.2") { // Purpur
exclude(group="org.yaml", module="snakeyaml")
}
// Pufferfish end
diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
index ed9c8e882739c02d0d04129d251e4c726b422c07..5426e57ed67b0d144818a7e3b917c90d45f548ce 100644
--- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
@@ -42,7 +27,7 @@ index ed9c8e882739c02d0d04129d251e4c726b422c07..5426e57ed67b0d144818a7e3b917c90d
"This can improve performance by a few percent, but has minor gameplay implications.");
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index f8750675044708e71dbf6293be6ce36bd6c510ca..b69799d0ae0ce8b176b910da886e71c4d25c94aa 100644
index 917cf327f3f9d824ec0da70fd9204624e7cf96fb..253f2e64f7d287057170ed50180e92d644a11f76 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -805,7 +805,7 @@ public class ServerLevel extends Level implements WorldGenLevel {