Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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@3c41f8f Cache map ids on item frames (#9584)
PaperMC/Paper@3b4839e Fix players are invisible after using setPlayerProfile (#9143)
PaperMC/Paper@20a71c5 Add restrict-player-reloot-time config (#7652)
PaperMC/Paper@29aaf7b Fix custom statistic criteria creation (#9595)
PaperMC/Paper@2df309b Bandaid fix for Effect (#9548)
PaperMC/Paper@1dfdbef SculkCatalyst bloom API (#9466)
PaperMC/Paper@02338e5 Fix DEFAULT getEntitySpawnReason for /summon (#9480)
PaperMC/Paper@23c44c2 [ci skip] Update README
This commit is contained in:
granny
2023-08-12 23:38:58 -07:00
parent e5a5f228f3
commit 1db35b2449
14 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0274-Debug-Marker-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Debug Marker API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d84e3e0f24c553acdbc71d096e1f000c669313cc..1f70b0e41915516a4826ad3ffb05876325ad941a 100644
index 77d80968f684947290044e8686132d2e4d4fcb8a..89f4e1146a22ee9dc610b67d0316dd9412e33a24 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1566,6 +1566,42 @@ public final class CraftServer implements Server {
@@ -52,7 +52,7 @@ index d84e3e0f24c553acdbc71d096e1f000c669313cc..1f70b0e41915516a4826ad3ffb058763
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 4720939d138300ed410871e40d3d2800224a7987..f30c6e09adb3a6aa485357f859fc2a22227350c9 100644
index a2e852adf47261b1b2eb9734cc90f4676ed58126..1392e483c363e25d1f16465d876cb7d7c70afa68 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2294,6 +2294,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -99,10 +99,10 @@ index 4720939d138300ed410871e40d3d2800224a7987..f30c6e09adb3a6aa485357f859fc2a22
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index eee650dc8ea13657d6be2530d8f637522a2e1303..7c2848019f4829754156d2a163d7974d9390d75f 100644
index 2a0c5b3dc171705d09aa1eccb094d2792d7332f2..71532b6ffed71a4e4f77ba1bb6d90abb0ff583b7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3279,5 +3279,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3294,5 +3294,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
}