Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More null paranoia.

Browse Source
This commit is contained in:
Florian Nücke
2022-01-15 19:39:23 +01:00
parent f84e1308da
commit 903d772b07
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/li/cil/oc2/common/container/AbstractComputerContainer.java
View File

@@ -13,6 +13,7 @@ import li.cil.oc2.common.vm.VirtualMachine;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.ContainerLevelAccess;
import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.level.Level;
import net.minecraftforge.energy.IEnergyStorage;
import java.nio.ByteBuffer;
@@ -63,7 +64,9 @@ public abstract class AbstractComputerContainer extends AbstractMachineTerminalC
@Override
public boolean stillValid(final Player player) {
return !computer.isRemoved() && stillValid(ContainerLevelAccess.create(computer.getLevel(), computer.getBlockPos()), player, Blocks.COMPUTER.get());
if (computer.isRemoved()) { return false; }
final Level level = computer.getLevel();
return level != null && stillValid(ContainerLevelAccess.create(level, computer.getBlockPos()), player, Blocks.COMPUTER.get());
}
@Override
@@ -76,7 +79,7 @@ public abstract class AbstractComputerContainer extends AbstractMachineTerminalC
///////////////////////////////////////////////////////////////////
protected static IntPrecisionContainerData createEnergyInfo(final IEnergyStorage energy, final CommonDeviceBusController busController) {
return new IntPrecisionContainerData() {
return new IntPrecisionContainerData.Server() {
@Override
public int getInt(final int index) {
return switch (index) {