AtlasMediaGroup/Scissors
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2025-07-04 19:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Paper and fix compilation errors (again)

Browse Source
This commit is contained in:
Telesphoreo
2023-10-06 02:32:03 -05:00
parent c268904a94
commit 1050894e5a
8 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0001-Build-changes.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 683159586641dd9aa42ae96fa51602469755723f..1806f60a0529c2d193bd54ea8f59ff2749e821eb 100644
index c187641f0ec6444a10e0e1583e1697d07e8f0267..9d13bd2d5cb152c6aa5834ad735d1695c05c097e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@ -108,7 +108,7 @@ index 97745f0bab8d82d397c6c2a5775aed92bca0a034..2f511b9c5f48773c17a659c00a94ba3d
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index fcd5096d64edfaf6bce3ecce8c9b9afb84462786..5d8b8b17854c1ae2a5e2ccfb8df1d7b927191f03 100644
index b7e7e6ed60f55d2ab5e4fcefb3638ad1768c3b7f..f7c3b65e0d6c76189aea00232b33722c4363d7dd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -267,7 +267,7 @@ import javax.annotation.Nullable; // Paper
@ -134,10 +134,10 @@ index 774556a62eb240da42e84db4502e2ed43495be17..741c76c4dfa0bb34cc23bd795c194bde
if (stream != null) {
diff --git a/src/test/java/org/bukkit/craftbukkit/legacy/PersistentDataContainerLegacyTest.java b/src/test/java/org/bukkit/craftbukkit/legacy/PersistentDataContainerLegacyTest.java
index 3f2b8b6f893c1ec6fba949251f028cb2a2d64068..456e6fba5ecaf7ec20d4904ace66059f9756e316 100644
index 4afaac5928e55e6ef233deb058150e2ec63162c4..c7201e0d1d8fe664b461b1d443c21782bdbfa63c 100644
--- a/src/test/java/org/bukkit/craftbukkit/legacy/PersistentDataContainerLegacyTest.java
+++ b/src/test/java/org/bukkit/craftbukkit/legacy/PersistentDataContainerLegacyTest.java
@@ -48,7 +48,9 @@ public class PersistentDataContainerLegacyTest extends AbstractTestingBase {
@@ -49,7 +49,9 @@ public class PersistentDataContainerLegacyTest extends AbstractTestingBase {
assertEquals(Float.valueOf(Float.MAX_VALUE), pdc.get(this.key("float"), PersistentDataType.FLOAT), "legacy float was wrong");
assertEquals(Double.valueOf(Double.MAX_VALUE), pdc.get(this.key("double"), PersistentDataType.DOUBLE), "legacy double was wrong");
assertEquals("stringy", pdc.get(this.key("string_simple"), PersistentDataType.STRING), "legacy string-simple was wrong");