Updated Upstream (Pufferfish)

Upstream has released updates that appear to apply and compile correctly

Pufferfish Changes:
pufferfish-gg/Pufferfish@e1ad783 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@d3d30cb Fix #53
pufferfish-gg/Pufferfish@53295bd Remove busy wait in async execution utility
pufferfish-gg/Pufferfish@5e6e1ad Updated Upstream (Paper)
This commit is contained in:
BillyGalbreath
2022-11-21 23:36:42 -06:00
parent d2c5e6b5e5
commit 6368dc84de
27 changed files with 184 additions and 149 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 49f655e9335a13110c2fbb11af02fc81e71e1dbe..d1c7f434d8779646ceef1e72af38a3e0d25d12f0 100644
index a2a7fa5508c9975449174365299fc6884f51b936..2f78b7c1b2bad8937ac0cdccd5be8faaf1057cbc 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2892,7 +2892,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 49f655e9335a13110c2fbb11af02fc81e71e1dbe..d1c7f434d8779646ceef1e72af38a3e0
if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
this.portalEntrancePos = pos.immutable();
}
@@ -3568,7 +3568,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3569,7 +3569,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean canChangeDimensions() {