From 4c4385f0ecde06480de4bef1dfc81d08fc00476c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Thu, 3 Feb 2022 17:31:33 +0100 Subject: [PATCH] Don't do stuff with the VM in robots on client side. --- .../java/li/cil/oc2/common/entity/Robot.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/li/cil/oc2/common/entity/Robot.java b/src/main/java/li/cil/oc2/common/entity/Robot.java index 069fa738..71c688e9 100644 --- a/src/main/java/li/cil/oc2/common/entity/Robot.java +++ b/src/main/java/li/cil/oc2/common/entity/Robot.java @@ -202,19 +202,15 @@ public final class Robot extends Entity implements li.cil.oc2.api.capabilities.R } public void start() { - if (level.isClientSide()) { - return; + if (!level.isClientSide()) { + virtualMachine.start(); } - - virtualMachine.start(); } public void stop() { - if (level.isClientSide()) { - return; + if (!level.isClientSide()) { + virtualMachine.stop(); } - - virtualMachine.stop(); } public void openTerminalScreen(final ServerPlayer player) { @@ -345,9 +341,11 @@ public final class Robot extends Entity implements li.cil.oc2.api.capabilities.R public void setRemoved(final RemovalReason reason) { super.setRemoved(reason); - // Full unload to release out-of-nbt persisted runtime-only data such as ram. - virtualMachine.stop(); - virtualMachine.dispose(); + if (!level.isClientSide()) { + // Full unload to release out-of-nbt persisted runtime-only data such as ram. + virtualMachine.stop(); + virtualMachine.dispose(); + } } @Override @@ -737,7 +735,9 @@ public final class Robot extends Entity implements li.cil.oc2.api.capabilities.R @Override protected void onContentsChanged(final DeviceItemStackHandler itemHandler, final int slot) { - virtualMachine.busController.scheduleBusScan(); + if (!level.isClientSide()) { + virtualMachine.busController.scheduleBusScan(); + } } }