Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2fa8efc Updated Upstream (Bukkit/CraftBukkit) (#9485)
PaperMC/Paper@508a295 Only erase allay memory on non-item targets (#9570)
PaperMC/Paper@31358d5 API for updating recipes on clients (#6463)
PaperMC/Paper@8fe8ca6 Add clickable version on version command (#9347)
PaperMC/Paper@d6d2b6f Only capture actual tree growth (#6464)
This commit is contained in:
granny
2023-08-05 20:40:50 -07:00
parent 22eb20c622
commit 0e36fd08b8
48 changed files with 175 additions and 175 deletions

View File

@@ -25,10 +25,10 @@ index 80c085498d9b61bae2e06df873c1ad66cc7d8ae5..59da6baab74e0a40e93fa02ce4ce2745
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8a98fab3e5052eb170653b869479a15f46643a20..8976113602277a64cd0049980701b6b7cbcc6b47 100644
index 67cdaf81d4417ff0ef3331d7bf436737d3531eb6..4f657ac60aa980fb00bc248ebb4e848d7a8d16d6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3103,5 +3103,10 @@ public final class CraftServer implements Server {
@@ -3141,5 +3141,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}