Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57: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@de04cbc Updated Upstream (Bukkit/CraftBukkit) (#10034)
This commit is contained in:
granny
2023-12-17 01:11:46 -08:00
parent 9e1216de50
commit eb3b67d5b2
30 changed files with 100 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0001-Rebrand.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts
index 170a915098f09ace226648da342a04c5c7583d11..fb1837bd5d0cb1970a6c236e72654a1c09502c48 100644
index b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec..d7951a9b3819ddc1d42e10d40bdf57ae47666d89 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -27,8 +27,12 @@ repositories {
@@ -24,8 +24,8 @@ index 170a915098f09ace226648da342a04c5c7583d11..fb1837bd5d0cb1970a6c236e72654a1c
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -65,6 +69,10 @@ dependencies {
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
+ implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
+ implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
@@ -197,10 +197,10 @@ index 34f19ac897a30c0c4e3ab406013fcca1c8b7db93..88b79cd90e936e1c48b84d7f762f425e
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 782bb8ca67517dde5dba8f0a133eb8699353dd01..faeed34e37be45e9d18ab0293535cade59fda440 100644
index e011cfcdda2e0a609d4158b0454bdf046b04c9d9..ace8ef2a55cf8e87d092f0b67b2d64b3a9e4f366 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -270,7 +270,7 @@ import javax.annotation.Nullable; // Paper
@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@@ -237,10 +237,10 @@ index 4e56018b64d11f76c8da43fd8f85c6de72204e36..9607675e6c5bff2183c4420d11fc63ee
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index ba2cd9c4cdbd5ddab1300320d7e0ede4d4b7a31a..3373df9e09bd29096c4b9c039c06256e4ecf4154 100644
index 25ffc92c3d6055285a64d9fe36c0054228fe81dd..538f385404450132d295707e3bfe19028b05ad9c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -917,7 +917,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -916,7 +916,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return EntityCategory.WATER;
}