maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash with lamp

Browse source
This commit is contained in:
drcrazy 2019-09-16 12:53:09 +03:00
parent 7e05b0da12
commit 666e8f03b2
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java
View file

@ -37,7 +37,6 @@ import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.powerSystem.PowerAcceptorBlockEntity;
import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.util.StringUtils; import reborncore.common.util.StringUtils;
import team.reborn.energy.Energy;
import team.reborn.energy.EnergyTier; import team.reborn.energy.EnergyTier;
import techreborn.blocks.generator.BlockSolarPanel; import techreborn.blocks.generator.BlockSolarPanel;
import techreborn.init.TRBlockEntities; import techreborn.init.TRBlockEntities;

4
src/main/java/techreborn/blockentity/lighting/LampBlockEntity.java
View file

@ -71,6 +71,10 @@ public class LampBlockEntity extends PowerAcceptorBlockEntity
@Override @Override
public boolean canAcceptEnergy(final Direction direction) { public boolean canAcceptEnergy(final Direction direction) {
if (world == null) {
// Blame tooltip for this
return true;
}
Direction me = BlockLamp.getFacing(world.getBlockState(pos)).getOpposite(); Direction me = BlockLamp.getFacing(world.getBlockState(pos)).getOpposite();
return direction == me; return direction == me;
} }

2
src/main/java/techreborn/blocks/misc/BlockRubberLog.java
View file

@ -49,8 +49,6 @@ import techreborn.events.TRRecipeHandler;
import techreborn.init.ModSounds; import techreborn.init.ModSounds;
import techreborn.init.TRContent; import techreborn.init.TRContent;
import techreborn.items.tool.ItemTreeTap; import techreborn.items.tool.ItemTreeTap;
import techreborn.items.tool.basic.ItemElectricTreetap;
import java.util.Random; import java.util.Random;
/** /**