Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b14979e Remove isRemoved skip on .discard() (#9520)
PaperMC/Paper@1837f6c Prevent entity removals if the entity slices is receiving status updates
PaperMC/Paper@a40e48f Add cause to PlayerOpenSignEvent (#9441)
This commit is contained in:
granny
2023-07-26 12:43:35 -07:00
parent 7cefa0cafa
commit 9dab7fe5f1
14 changed files with 47 additions and 47 deletions

View File

@@ -17,10 +17,10 @@ index 6408bc1749c08fe5255c054bf4342e0870db2a20..7c1b92611f175156116554b5d33636ec
// 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 e4822d29f61f086e4967fcda8e7efd5b485b3d6b..6bedb5af6da75a49a1caa8bced73008bac559d50 100644
index 168a906927ecb054c7dede2ceafa52bf80ebcace..a9bccae1837004444469965ebd25910407aa886a 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3059,12 +3059,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3058,12 +3058,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return Vec3.directionFromRotation(this.getRotationVector());
}