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

@@ -121,10 +121,10 @@ index 6b4cb3a94dc998e7a087c888876a15c36763bfd0..55e3ab7b82a287715b35045a1bb6d6eb
return entityplayer1;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3560bb641bb96c94431f743c8956a75e901988be..95e7d60e2f56bdadf2d5cebe125774f9d5a458e8 100644
index f73b4facacaa68255c2ec372a0a1a5878e5de484..b3ce4424b83d8f44f61b8923d02f2f9e4c415e67 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2711,5 +2711,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2717,5 +2717,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}