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@046466f Re-arrange most chunk system patches to front (#8338)
PaperMC/Paper@e8c2c3b Fix World#refreshChunk not working for chunks in no-tick range
This commit is contained in:
BillyGalbreath
2022-09-01 21:51:05 -05:00
parent be681220d6
commit ff8e329e9d
29 changed files with 160 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0292-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 2e257704af6dc016303876cf39de971982b21db2..0afdaebb071061bc26ae302bfe0d86149227850c 100644
index 3806d4dbc846e75b3c4d1808b28f82eb638a3dce..d182eac78879b5e124bb62aded8a405b327275b4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1463,6 +1463,42 @@ public final class CraftServer implements Server {
@@ -52,10 +52,10 @@ index 2e257704af6dc016303876cf39de971982b21db2..0afdaebb071061bc26ae302bfe0d8614
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 824c12db04aaaa750de54fce8a15b386dec1cc08..01313fdd9d5a1909bfbcbf8f613030e7727f1c36 100644
index 4b9d57a63a0eb922f77d34e4d2d7f3b0aa364337..42058ebca02f1ae7fdf970b9fdf36afc4d486e87 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2260,6 +2260,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2251,6 +2251,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
public float getLocalDifficultyAt(Location location) {
return getHandle().getCurrentDifficultyAt(net.minecraft.server.MCUtil.toBlockPosition(location)).getEffectiveDifficulty();
}
@@ -97,12 +97,12 @@ index 824c12db04aaaa750de54fce8a15b386dec1cc08..01313fdd9d5a1909bfbcbf8f613030e7
+ }
// Purpur end
// Paper start
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 6d7947e0d4dd1bae45d5a9ca4adbd4d49a28ee71..6cc714d4044926a84feb5c084f2d15db1c29b21e 100644
index 5e755977b49e4874cf489bddb5be6b1fdc55152f..44ad108729a0cf434de14b60d979920988ae3e7d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2979,5 +2979,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2969,5 +2969,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean hasFlyingFallDamage() {
return getHandle().flyingFallDamage;
}