mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Fixed box blacklist
This commit is contained in:
1 parent
859186f766
commit
69cad9dade
3 files changed
+4
-4
No files matched your search
@@ -17,11 +17,11 @@ public class MekanismAPI
|
||||
/** Mekanism debug mode */
|
||||
public static boolean debug = false;
|
||||
|
||||
public static boolean isBlockCompatible(Item item, int meta)
|
||||
public static boolean isBlockCompatible(Block block, int meta)
|
||||
{
|
||||
for(BlockInfo i : cardboardBoxIgnore)
|
||||
{
|
||||
if(i.block == Block.getBlockFromItem(item) && (i.meta == OreDictionary.WILDCARD_VALUE || i.meta == meta))
|
||||
if(i.block == block && (i.meta == OreDictionary.WILDCARD_VALUE || i.meta == meta))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -41,9 +41,9 @@ import mekanism.common.block.states.BlockStateMachine.MachineType;
|
||||
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
|
||||
import mekanism.common.capabilities.Capabilities;
|
||||
import mekanism.common.chunkloading.ChunkManager;
|
||||
import mekanism.common.config.TypeConfigManager;
|
||||
import mekanism.common.config.MekanismConfig.general;
|
||||
import mekanism.common.config.MekanismConfig.usage;
|
||||
import mekanism.common.config.TypeConfigManager;
|
||||
import mekanism.common.content.boiler.SynchronizedBoilerData;
|
||||
import mekanism.common.content.entangloporter.InventoryFrequency;
|
||||
import mekanism.common.content.matrix.SynchronizedMatrixData;
|
||||
|
||||
@@ -82,7 +82,7 @@ public class ItemBlockCardboardBox extends ItemBlock
|
||||
Block block = state.getBlock();
|
||||
int meta = block.getMetaFromState(state);
|
||||
|
||||
if(!world.isRemote && MekanismAPI.isBlockCompatible(Item.getItemFromBlock(block), meta) && state.getBlockHardness(world, pos) != -1)
|
||||
if(!world.isRemote && MekanismAPI.isBlockCompatible(block, meta) && state.getBlockHardness(world, pos) != -1)
|
||||
{
|
||||
BlockData data = new BlockData();
|
||||
data.block = block;
|
||||
|
||||
Reference in new issue
Block a user