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@431e641 Fixup player profile getters and constructor to expected nullability (#9770)
PaperMC/Paper@cfe311d Fix item effects conversion if no tag is present
This commit is contained in:
granny
2023-10-05 00:16:29 -07:00
parent 92daa1b961
commit fd01882d1f
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.20.2-R0.1-SNAPSHOT
mcVersion = 1.20.2
paperCommit = 02cfaa8ff81fed20f4c635d8ccf344083d938973
paperCommit = cfe311d7a51eeb9e14c526f57efab9837f30c5d0
org.gradle.caching = true
org.gradle.parallel = true

6
patches/server/0011-Bring-back-server-name.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Bring back server name
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
index 0d0ed4cb50364828d0a028ee69654e23b3b8d913..5b20ac9ef8f05d111ba32f6435f1299e054f0b8c 100644
index c5598adb8cbcbcf7277c2fd4dd72c243d44d9700..cda4544ae96a4fcb5c6c4483df67a59f1b53fd27 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
@@ -58,6 +58,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
@@ -17,10 +17,10 @@ index 0d0ed4cb50364828d0a028ee69654e23b3b8d913..5b20ac9ef8f05d111ba32f6435f1299e
public final boolean spawnNpcs = this.get("spawn-npcs", true);
public final boolean pvp = this.get("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1225adadac3b4dd0e371b77efd8f30e99b71c4b9..46ffe17eec96902fb7d8c35cdad0a79a5653e27c 100644
index f5aed90cc0e09136a566b4790b476ba1c37ce3dc..7c74102cfa293a1549b47907ec59367b55db6791 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3142,4 +3142,11 @@ public final class CraftServer implements Server {
@@ -3147,4 +3147,11 @@ public final class CraftServer implements Server {
}
// Paper end

4
patches/server/0014-Lagging-threshold.patch
View File

@@ -25,10 +25,10 @@ index d0f0b17f4071ca716a3f3361bf1080b9607e4e04..b064e88913e932d070f36dd3f4832f63
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 95cda82554bcf888b0a94ba8f122a8a9bb2a5582..badcaf433d9862ce1b74cb283cd5151f968aab82 100644
index 7c74102cfa293a1549b47907ec59367b55db6791..00f80e8722e69c06c79bb17090812a04c6590d1d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3148,5 +3148,10 @@ public final class CraftServer implements Server {
@@ -3153,5 +3153,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}