Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c1ea550 Remove more outdated config settings (#9358)
PaperMC/Paper@3a03739 Add method to get ungenerated chunk from long key (#9254)
PaperMC/Paper@072b78a Add trail ruins structure set seed in spigot config (#9327)
PaperMC/Paper@faf9a65 Disable BukkitMirrorTest
PaperMC/Paper@873533b Add method to remove all active potion effects (#9361)
PaperMC/Paper@275173e Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@976b95c Temp: Pre-init PlayerChunkLoaderData in order to prepopulate the BFS lookup cache because potatos (Closes #9338)
PaperMC/Paper@d6d4c78 Move some Folia API to Paper for easy compat (#9360)
PaperMC/Paper@b1fe756 Revert "Move some Folia API to Paper for easy compat (#9360)"
PaperMC/Paper@1f5bec7 Pull Folia API take two
PaperMC/Paper@3756f5b Properly Cancel Usable Items (#9225)
This commit is contained in:
granny
2023-06-20 15:54:20 -07:00
parent fa3166a24d
commit 991719aa9e
52 changed files with 243 additions and 229 deletions

View File

@@ -17,10 +17,10 @@ index c177b6ebf0e2d10d19674094a4fed8637d305bda..81bfdafb84c543938375a1a90dab49a8
// CraftBukkit end
this.setServerLevel(worldserver);
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 6e240eb1c656fb362d2b8005145fd840d0a088fb..b6f854a5f3dc79ef19aa20c7fde642e703091453 100644
index 5aaf8ffac3695f090b739d3f05847a37b58140b5..3f4b14ebbab07864b3fe00ecaf3094ee48946b24 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3063,12 +3063,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3076,12 +3076,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return Vec3.directionFromRotation(this.getRotationVector());
}