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] Add MC-4 fix back
diff --git a/src/main/java/net/minecraft/world/entity/item/EntityItem.java b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
index be46b8fcbfed932ba96a34c94eee0b237c783bd4..dd4997e7ffac4773e01add88efec7c0dcd7b4df0 100644
index bb3ea44a641cc830416e9e000357199150135047..d05d874d54fdf821429814b7b20a3676d426303c 100644
--- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java
+++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
@@ -583,7 +583,7 @@ public class EntityItem extends Entity {
@@ -589,7 +589,7 @@ public class EntityItem extends Entity {
// Paper start - fix MC-4
public void setPositionRaw(double x, double y, double z) {