Updated Upstream (Airplane)

Upstream has released updates that appear to apply and compile correctly

Airplane Changes:
TECHNOVE/Airplane@08b29b1 Inclusive bug fix for liquid checking
This commit is contained in:
granny
2021-09-17 02:01:45 -07:00
parent 161dcf0319
commit 8096340a2f

View File

@@ -1949,7 +1949,7 @@ index 7437f01ca8f416e2c9150250e324af4725a4efb6..bdcd0e38a3ba904811112f41d8bfbfc0
int LARGE_MAX_STACK_SIZE = 64; int LARGE_MAX_STACK_SIZE = 64;
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 94857a736d2a16e8ade286c6f2ddf8bd798008eb..598575b540752e050a94ca703a2b135adbb2018c 100644 index 94857a736d2a16e8ade286c6f2ddf8bd798008eb..a88ad1035573dd0b35d0140859261229a1df8cf0 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -338,6 +338,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -338,6 +338,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -2088,7 +2088,7 @@ index 94857a736d2a16e8ade286c6f2ddf8bd798008eb..598575b540752e050a94ca703a2b135a
+ +
+ net.minecraft.world.level.chunk.LevelChunkSection[] sections = chunk.getSections(); + net.minecraft.world.level.chunk.LevelChunkSection[] sections = chunk.getSections();
+ +
+ for (int currY = minYIterate; currY <= maxYIterate; ++currY) { + for (int currY = minYIterate; currY < maxYIterate; ++currY) {
+ net.minecraft.world.level.chunk.LevelChunkSection section = sections[(currY >> 4) - minSection]; + net.minecraft.world.level.chunk.LevelChunkSection section = sections[(currY >> 4) - minSection];
+ +
+ if (section == null || section.isEmpty() || section.fluidStateCount == 0) { // if no fluids, nothing in this section + if (section == null || section.isEmpty() || section.fluidStateCount == 0) { // if no fluids, nothing in this section
@@ -2100,8 +2100,8 @@ index 94857a736d2a16e8ade286c6f2ddf8bd798008eb..598575b540752e050a94ca703a2b135a
+ +
+ net.minecraft.world.level.chunk.PalettedContainer<BlockState> blocks = section.states; + net.minecraft.world.level.chunk.PalettedContainer<BlockState> blocks = section.states;
+ +
+ for (int currZ = minZ; currZ <= maxZ; ++currZ) { + for (int currZ = minZ; currZ < maxZ; ++currZ) {
+ for (int currX = minX; currX <= maxX; ++currX) { + for (int currX = minX; currX < maxX; ++currX) {
+ int localBlockIndex = (currX) | (currZ << 4) | ((currY & 15) << 8); + int localBlockIndex = (currX) | (currZ << 4) | ((currY & 15) << 8);
+ FluidState fluid = blocks.get(localBlockIndex).getFluidState(); + FluidState fluid = blocks.get(localBlockIndex).getFluidState();