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@b9b4c9a Deprecate duplicate API for arrow stuck count (#8829)
PaperMC/Paper@57f1157 Updated Upstream (Bukkit/CraftBukkit) (#8823)
This commit is contained in:
granny
2023-02-08 20:24:09 -08:00
parent 5c6a830298
commit cbb7fc002e
23 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,10 +52,10 @@ index 4612962d46b2c39f4fd8afd3953eba7b2b807625..0f0a1c1730cdcddc05b0d04411d79c54
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index fcc6ac180a74daffa173866be3dd97a3ad63ebd7..804f81c478c09a5b6d0b10a78dc2b7ae0b88cc18 100644
index ba570a518f2bcdb23fd2118663c2b82e7484629d..9b5323edd99848b73ea0e34230e7bec8dc23be8c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2241,6 +2241,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2257,6 +2257,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 fcc6ac180a74daffa173866be3dd97a3ad63ebd7..804f81c478c09a5b6d0b10a78dc2b7ae
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 440dd0a91077776267943fe13fedbfc405c5a886..1a3f35120ac9550bb594c7d400009bd1a06a0b6d 100644
index ff3ff7fb1aaacba3e2551666dcd1b385a526bdce..fbdebd237d31e3dda3923c1a1e132bb149056b66 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3096,5 +3096,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3109,5 +3109,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
}