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

@@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for end portal safe teleporting
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 61dd24478dc1f955a3c67e81858aa7cec023b4de..75eb55794b3f025d065a4025bfbf415ac669b967 100644
index 620dbbf8fc411cf52f71d00de9334f41a2a34010..8f21dbd5eb43dec6aa059ded36b92b4322ecb24c 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3133,7 +3133,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3132,7 +3132,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
this.processPortalCooldown();