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

@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index ebdeb74a882f5f70214e6adfd83c5254dab29a5a..1b381125b16f231686b507985807028824b9d441 100644
index 829dc166548c7fc2890aa4abb5906586b448306f..7326d63874e7e1be7d8649c9a4d3bdaa2d0b195f 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1499,7 +1499,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
@@ -1531,7 +1531,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
return this.isInWater() || flag;
}