Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c389b1c Fix configs that relied on outdated min/max y levels (#6986)
PaperMC/Paper@57555b8 Add missing structure set seed configs (#8030)
This commit is contained in:
BillyGalbreath
2022-10-09 23:55:46 -05:00
parent c577b117e7
commit 38313f701e
15 changed files with 44 additions and 44 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 fcef95dfe75e6ec39e07bab6edf4b12cb5db48aa..564ad407266f451c3ece6232ca741456dc9d5a56 100644
index 79a2a7ed3f8812a4ffb58a9ccc0a907754af6610..42d1c18ef4a69113519440ba1f2884d6cb8e1077 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2894,7 +2894,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2893,7 +2893,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public void handleInsidePortal(BlockPos pos) {
if (this.isOnPortalCooldown()) {
this.setPortalCooldown();
@@ -17,7 +17,7 @@ index fcef95dfe75e6ec39e07bab6edf4b12cb5db48aa..564ad407266f451c3ece6232ca741456
if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
this.portalEntrancePos = pos.immutable();
}
@@ -3566,7 +3566,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3565,7 +3565,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean canChangeDimensions() {