Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@7f47b9b Remove KeyedObject interface (#7680)
PaperMC/Paper@7bf9446 Add per player chunk loading limits
PaperMC/Paper@04c7b16 Undeprecate Material#isLegacy (#7679)
This commit is contained in:
BillyGalbreath
2022-04-01 09:08:53 -05:00
parent 47cb2cef8e
commit dfd5a7a91f
19 changed files with 64 additions and 64 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 76d953defbef937cca168b1ef38ce22337e48b40..b63fde99b966ee2c2acdc0feeef08461ef7b5816 100644
index 6c45a860407e42d0f72ab02afddc5b1feca837f3..f09f233c2005b600feffee27237ce01c6207b255 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2846,7 +2846,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -2831,7 +2831,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
this.processPortalCooldown();