@@ -34017,7 +34017,7 @@ index ca23af013967b50420ebee178878ea79333de53b..d41b9266625ca6c5e32c5126f35a1f77
34017
34017
34018
34018
public int getLightSectionCount() {
34019
34019
diff --git a/net/minecraft/world/level/material/FlowingFluid.java b/net/minecraft/world/level/material/FlowingFluid.java
34020
- index a3e379ec92e38107d7ebde9c67ec129da52a547a..083083172a4be961ac25ead7ac61a10a71b2c919 100644
34020
+ index a3e379ec92e38107d7ebde9c67ec129da52a547a..482bbb50b7f4b19813c1043228701da54d850064 100644
34021
34021
--- a/net/minecraft/world/level/material/FlowingFluid.java
34022
34022
+++ b/net/minecraft/world/level/material/FlowingFluid.java
34023
34023
@@ -46,6 +46,48 @@ public abstract class FlowingFluid extends Fluid {
@@ -34069,7 +34069,7 @@ index a3e379ec92e38107d7ebde9c67ec129da52a547a..083083172a4be961ac25ead7ac61a10a
34069
34069
@Override
34070
34070
protected void createFluidStateDefinition(StateDefinition.Builder<Fluid, FluidState> builder) {
34071
34071
builder.add(FALLING);
34072
- @@ -210,65 +252,73 @@ public abstract class FlowingFluid extends Fluid {
34072
+ @@ -210,65 +252,71 @@ public abstract class FlowingFluid extends Fluid {
34073
34073
}
34074
34074
}
34075
34075
@@ -34123,13 +34123,13 @@ index a3e379ec92e38107d7ebde9c67ec129da52a547a..083083172a4be961ac25ead7ac61a10a
34123
34123
- map.removeLastByte();
34124
34124
- }
34125
34125
+ final ca.spottedleaf.moonrise.patches.collisions.util.FluidOcclusionCacheKey[] cache = ((ca.spottedleaf.moonrise.patches.collisions.block.CollisionBlockState)fromState).moonrise$hasCache() & ((ca.spottedleaf.moonrise.patches.collisions.block.CollisionBlockState)toState).moonrise$hasCache() ?
34126
- + COLLISION_OCCLUSION_CACHE.get() : null;
34126
+ + COLLISION_OCCLUSION_CACHE.get() : null;
34127
34127
34128
34128
- map.putAndMoveToFirst(blockStatePairKey, (byte)(flag ? 1 : 0));
34129
34129
- }
34130
34130
+ final int keyIndex
34131
- + = (((ca.spottedleaf.moonrise.patches.collisions.block.CollisionBlockState)fromState).moonrise$uniqueId1() ^ ((ca.spottedleaf.moonrise.patches.collisions.block.CollisionBlockState)toState).moonrise$uniqueId2() ^ ((ca.spottedleaf.moonrise.patches.collisions.util.CollisionDirection)(Object)direction).moonrise$uniqueId())
34132
- + & (COLLISION_OCCLUSION_CACHE_SIZE - 1);
34131
+ + = (((ca.spottedleaf.moonrise.patches.collisions.block.CollisionBlockState)fromState).moonrise$uniqueId1() ^ ((ca.spottedleaf.moonrise.patches.collisions.block.CollisionBlockState)toState).moonrise$uniqueId2() ^ ((ca.spottedleaf.moonrise.patches.collisions.util.CollisionDirection)(Object)direction).moonrise$uniqueId())
34132
+ + & (COLLISION_OCCLUSION_CACHE_SIZE - 1);
34133
34133
34134
34134
- return flag;
34135
34135
- }
@@ -34138,8 +34138,8 @@ index a3e379ec92e38107d7ebde9c67ec129da52a547a..083083172a4be961ac25ead7ac61a10a
34138
34138
+ if (cached != null && cached.first() == fromState && cached.second() == toState && cached.direction() == direction) {
34139
34139
+ return cached.result();
34140
34140
}
34141
- } else {
34142
- return false;
34141
+ - } else {
34142
+ - return false;
34143
34143
}
34144
34144
+
34145
34145
+ final VoxelShape shape1 = fromState.getCollisionShape(level, fromPos);
0 commit comments