mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-09-03 10:57:55 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/fabric' into fabric

Browse Source 
# Conflicts:
#	src/main/java/dan200/computercraft/shared/computer/blocks/BlockComputerBase.java
This commit is contained in:
Devan-Kerman
2020-09-04 18:09:36 -05:00
parent c5eb7a9501 bc969db2be
commit dc88fbeb12
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/dan200/computercraft/shared/ComputerCraftRegistry.java
View File

@@ -90,7 +90,7 @@ public final class ComputerCraftRegistry {
ComputerFamily.ADVANCED,
ModTiles.COMPUTER_ADVANCED));
public static final BlockComputer COMPUTER_COMMAND = register("computer_command",
new BlockComputer(Block.Settings.of(Material.STONE)
new BlockComputer(FabricBlockSettings.copyOf(Blocks.STONE)
.strength(-1, 6000000.0F),
ComputerFamily.COMMAND,
ModTiles.COMPUTER_COMMAND));

2
src/main/java/dan200/computercraft/shared/computer/blocks/BlockComputerBase.java
View File

@@ -182,5 +182,7 @@ public abstract class BlockComputerBase<T extends TileComputerBase> extends Bloc
state.onStacksDropped(serverWorld, pos, player.getMainHandStack());
}
// Call super as it is what provides sound and block break particles. Does not do anything else.
super.onBreak(world, pos, state, player);
}
}