icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.15

Browse Source 
# Conflicts:
#	src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
#	src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java
This commit is contained in:
gnembon committed 2019-10-09 21:37:27 -03:00
2 parents ec0be058ac 155c62d3fc
commit 3e6363ae12
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
+1 -1
View File
@@ -32,7 +32,7 @@ public abstract class PistonBlock_movableTEMixin extends FacingBlock
@Inject(method = "isMovable", at = @At("HEAD"), cancellable = true)
private static void slimeHoney(BlockState blockState_1, World world_1, BlockPos blockPos_1, Direction direction_1, boolean boolean_1, Direction direction_2, CallbackInfoReturnable<Boolean> cir)
{
if (CarpetSettings.stickyHoney && direction_1 != direction_2)
if (CarpetSettings.honeyGlidingSlime && direction_1 != direction_2)
{
Block block = blockState_1.getBlock();
if (block != Blocks.HONEY_BLOCK && block != Blocks.SLIME_BLOCK) return;