Skip to content

Commit eec6d9e

Browse files
committed
bug: Fixed Create Pulleys and Gantries pushing more blocks than in vanilla Create
1 parent 476087c commit eec6d9e

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Changed:
1010

1111
Fixed:
1212
- Fixed NO_DAMAGE munition damage setting not applying to shrapnel (including flak and grapeshot)
13+
- Fixed Create Pulleys and Gantries pushing more blocks than in vanilla Create
1314

1415
## [5.11.2] - 2026-02-27
1516

src/main/java/rbasamoyai/createbigcannons/mixin/compat/create/ContraptionMixin.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
import javax.annotation.Nullable;
88

9-
import com.simibubi.create.AllContraptionTypes;
10-
119
import org.apache.commons.lang3.tuple.Pair;
1210
import org.spongepowered.asm.mixin.Mixin;
1311
import org.spongepowered.asm.mixin.Shadow;
@@ -22,7 +20,7 @@
2220
import com.llamalad7.mixinextras.sugar.Share;
2321
import com.llamalad7.mixinextras.sugar.ref.LocalBooleanRef;
2422
import com.llamalad7.mixinextras.sugar.ref.LocalRef;
25-
import com.simibubi.create.api.contraption.ContraptionType;
23+
import com.simibubi.create.AllContraptionTypes;
2624
import com.simibubi.create.content.contraptions.AssemblyException;
2725
import com.simibubi.create.content.contraptions.Contraption;
2826
import com.simibubi.create.content.contraptions.StructureTransform;

src/main/java/rbasamoyai/createbigcannons/remix/ContraptionRemix.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
1515

1616
import com.simibubi.create.AllBlocks;
17-
import com.simibubi.create.content.contraptions.AssemblyException;
1817
import com.simibubi.create.api.contraption.BlockMovementChecks;
18+
import com.simibubi.create.content.contraptions.AssemblyException;
1919
import com.simibubi.create.content.contraptions.Contraption;
2020
import com.simibubi.create.content.contraptions.chassis.ChassisBlockEntity;
2121
import com.simibubi.create.content.contraptions.gantry.GantryContraption;
@@ -370,9 +370,10 @@ public static <T extends Contraption & CanLoadBigCannon> boolean getStickFlag(T
370370
&& level.getBlockEntity(offsetPos) instanceof IBigCannonBlockEntity cbe) {
371371
pushState = cbe.cannonBehavior().block().state();
372372
}
373-
boolean push = offset == forcedDirection && !BlockMovementChecks.isNotSupportive(state, forcedDirection);
373+
boolean pushingMunition = IBigCannonBlockEntity.isValidMunitionState(forcedAxis, pushState);
374+
boolean push = offset == forcedDirection && !BlockMovementChecks.isNotSupportive(state, forcedDirection) && pushingMunition;
374375
if ((contraption instanceof GantryContraption || contraption instanceof PulleyContraption && !push)
375-
&& !IBigCannonBlockEntity.isValidMunitionState(forcedAxis, pushState)) {
376+
&& !pushingMunition) {
376377
return false;
377378
}
378379
if (push

0 commit comments

Comments
 (0)