Updated Upstream (Airplane)

Upstream has released updates that appear to apply and compile correctly

Airplane Changes:
TECHNOVE/Airplane@002f470 Upstream
TECHNOVE/Airplane@e163330 Improve performance of checking entity fluids (63)
TECHNOVE/Airplane@e45543d Collision cache (#62)
TECHNOVE/Airplane@7cf2c68 Upstream
TECHNOVE/Airplane@a434719 Temporarily pull my Paper PR
TECHNOVE/Airplane@1afb99c Use new version fetcher
TECHNOVE/Airplane@21d3f86 Hotfix hard collisions check
TECHNOVE/Airplane@5ed110b Fix hash
This commit is contained in:
granny
2021-10-08 03:10:24 -07:00
parent 8ea46a7e26
commit ad6f2f58c8
19 changed files with 781 additions and 173 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for end portal safe teleporting
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 12662cb04b247bd46b3e1fab060e1c17a56e84a3..4ddbd66221d3a3e319335e2b0eefadc9adc64c8f 100644
index 6d425a5eafec8b25ce15fb4c36ea1148f5bd92aa..b8dcebde55c73b283c13b3d82dd07388dad3eb9d 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2782,7 +2782,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -2785,7 +2785,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
}
this.processPortalCooldown();