Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@17eb884 Use a CHM for StructureTemplate.Pallete cache
PaperMC/Paper@f79c0da Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@2121aed Rebuild patches
This commit is contained in:
BillyGalbreath
2022-02-01 17:42:55 -06:00
parent 293e682af4
commit 3f1ad9380d
9 changed files with 17 additions and 17 deletions

View File

@@ -223,10 +223,10 @@ index 88bc0807e8bf66a65422f85f1112336334eb3de2..d0e822b329085b9d0a42276c3cacd6cb
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 6ab040777b2b642893ac765eb77acaabf79d83f1..8d7fcd128b497a6366a0710a1176e63b41a25cdc 100644
index 57f53ad50e3f26c9301f16f0d6b25f1cd1bebaa5..1bfc4c8156ebcab30a7009f5daaf5ebcd59aed45 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1999,6 +1999,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2005,6 +2005,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().getAbilities().walkingSpeed * 2f;
}