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

Updated Upstream (Pufferfish)

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

Pufferfish Changes:
pufferfish-gg/Pufferfish@8a81176 Update SIMD to allow Java 18
pufferfish-gg/Pufferfish@9b5a480 Update YAML libs
This commit is contained in:
BillyGalbreath
2022-03-28 11:15:56 -05:00
parent be3013aa3a
commit e2af40a9e2
3 changed files with 130 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0002-Rebrand.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts
index 5b10c880ac9daa66badf199bddd2653a0f7c0c08..e8bbf2519a75a94002b20c31a709a41eec4716aa 100644
index 3fe815647ff89d463137aff3cb08d2276dbbf827..5dc4106efefb5400cf5504b225e1e6e5788d14f3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,7 +18,7 @@ repositories {
@@ -25,7 +25,7 @@ index 5b10c880ac9daa66badf199bddd2653a0f7c0c08..e8bbf2519a75a94002b20c31a709a41e
+ implementation("dev.omega24:upnp4j:1.0") // Purpur
// Pufferfish start
implementation("org.yaml:snakeyaml:1.28")
implementation("org.yaml:snakeyaml:1.30")
@@ -87,7 +89,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -221,7 +221,7 @@ index 303b70f0433ff49a3bee2a0d92c41f01aec38bee..5e9fc979daced5dad9977ab12ea019f4
private static final int DEFAULT_SIZE_THRESHOLD = 1024 * 8;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f266ee28bae60cf938bf2769df71af7ffd3e5bfe..5db94729b74419054264f0cbb4e1a7ddf455f0b7 100644
index 22dc604b42b068ca7b5cbf7d3920a4696c96ad34..a0c08d7c6f1d9f3e157c4776ba9b2536449ad52d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper