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] Entities can use portals configuration
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 0a8aca17afe93af248d8a9074b6fe08bc60346ba..d672233bbb672ace6218ab8117714add56133685 100644
index 204c870b409f82d98b99ff7dee348ba09697d5fe..a4aed8c797f0a5548b5837471083cc48e717ad37 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2798,7 +2798,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -2783,7 +2783,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public void handleInsidePortal(BlockPos pos) {
if (this.isOnPortalCooldown()) {
this.setPortalCooldown();
@@ -17,7 +17,7 @@ index 0a8aca17afe93af248d8a9074b6fe08bc60346ba..d672233bbb672ace6218ab8117714add
if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
this.portalEntrancePos = pos.immutable();
}
@@ -3464,7 +3464,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -3449,7 +3449,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean canChangeDimensions() {