Repo-Mirror/MoonriseMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix init in FlowingFluidMixin

Browse Source 
The fluid state may have additional properties, so it is
inappropriate to iterate over all of the states and assume
that there will be no duplicate values with the same falling
and level property values.
This commit is contained in:
Spottedleaf
2024-08-10 14:40:55 -07:00
parent edad8be41f
commit 65481aee6d
1 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/ca/spottedleaf/moonrise/mixin/fluid/FlowingFluidMixin.java
View File

@@ -62,35 +62,26 @@ abstract class FlowingFluidMixin extends Fluid {
*/
@Unique
private void init() {
for (final FluidState state : this.getFlowing().getStateDefinition().getPossibleStates()) {
if (!state.isSource()) {
if (this.flowingLookUp == null) {
this.flowingLookUp = new FluidState[TOTAL_FLOWING_STATES];
}
final int index = (state.getValue(FALLING).booleanValue() ? 1 : 0) | ((state.getValue(LEVEL).intValue() - MIN_LEVEL) << 1);
if (this.flowingLookUp[index] != null) {
throw new IllegalStateException("Already inited");
}
this.flowingLookUp[index] = state;
synchronized (this) {
if (this.init) {
return;
}
}
for (final FluidState state : this.getSource().getStateDefinition().getPossibleStates()) {
if (state.isSource()) {
if (state.getValue(FALLING).booleanValue()) {
if (this.sourceFalling != null) {
throw new IllegalStateException("Already inited");
}
this.sourceFalling = state;
} else {
if (this.sourceNotFalling != null) {
throw new IllegalStateException("Already inited");
}
this.sourceNotFalling = state;
}
}
}
this.flowingLookUp = new FluidState[TOTAL_FLOWING_STATES];
final FluidState defaultFlowState = this.getFlowing().defaultFluidState();
for (int i = 0; i < TOTAL_FLOWING_STATES; ++i) {
final int falling = i & 1;
final int level = (i >>> 1) + MIN_LEVEL;
this.init = true;
this.flowingLookUp[i] = defaultFlowState.setValue(FALLING, falling == 1 ? Boolean.TRUE : Boolean.FALSE)
.setValue(LEVEL, Integer.valueOf(level));
}
final FluidState defaultFallState = this.getSource().defaultFluidState();
this.sourceFalling = defaultFallState.setValue(FALLING, Boolean.TRUE);
this.sourceNotFalling = defaultFallState.setValue(FALLING, Boolean.FALSE);
this.init = true;
}
}
/**