Updated Upstream (Tuinity & Airplane)

Upstream has released updates that appear to apply and compile correctly

Tuinity Changes:
f7c42491a Fix dangerous end portal logic

Airplane Changes:
8c5012517 Switch bitset to long storage
617dfe27a Patch Paper to use fast item merge raytracing
16104e8a0 Update Upstream (Tuinity)
This commit is contained in:
BillyGalbreath
2021-06-01 19:45:44 -05:00
parent d2204a3dac
commit ff09f9e62d
26 changed files with 1250 additions and 360 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Drowning Settings
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index e915905af690124f17407876c0fb854750f5db71..9325163e392213be1d51588b95361af63d294952 100644
index 666f5a2e5fe82a283dfcb1f25ed58d0a971c73d3..feb5a6d8a534c4ee19940847cd53ff325335c4d6 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2605,7 +2605,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
@@ -2638,7 +2638,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
}
public int getDefaultPortalCooldown() {