Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +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@1cda66e Hotfix Entity isInRain reobf issue
PaperMC/Paper@61768e0 [ci skip] Remove no longer needed mappings change
PaperMC/Paper@e035fd7 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@c215ce1 [ci skip] cleanup patch diff from last commit
This commit is contained in:
granny
2023-12-25 18:45:01 -08:00
parent 6aec125590
commit 10685bb957
24 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,10 +52,10 @@ index 966f8e764c2ad42cdfc84b5037081121937598b6..741a3cf8df218635cb5430db8d2c6129
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 648be304b99793fcec850ee6f3965baf1cd679d8..14df9ede813b64f87d97a1ffa96024361b10f131 100644
index 96017efa7ab5b43bdd851ce1e78566306254d4a0..7321a8dfc59ccb1ae0b7e2d1ce23cb1a5cfbe029 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2364,6 +2364,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2412,6 +2412,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
public float getLocalDifficultyAt(Location location) {
return getHandle().getCurrentDifficultyAt(io.papermc.paper.util.MCUtil.toBlockPosition(location)).getEffectiveDifficulty();
}
@@ -99,10 +99,10 @@ index 648be304b99793fcec850ee6f3965baf1cd679d8..14df9ede813b64f87d97a1ffa9602436
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index df3953b541fc85985ded4a89e03bf5d840f7ed6d..c15d14067e9061172ab0b07056ef8b6aa971790c 100644
index 55d07278e635f9934418ac5c4e679e99b0b5dbd1..0081992c78ad800c7caeb402e90d6e93d3a2d28e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3379,5 +3379,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3378,5 +3378,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}