Merge remote-tracking branch 'origin/master-1.19-lts' into master-1.2…

…0-lts
CyclopsMC · Dec 13, 2024 · 978f4bb · 978f4bb
2 parents be9748a + cc7f787
commit 978f4bb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/resources/changelog/1.19.2-1.2.41.txt b/resources/changelog/1.19.2-1.2.41.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.17.0 or higher.
+
+Fixes:
+* Don't invoke WorldHelpers.efficientTick client-side, Related to #961
+
diff --git a/...java/org/cyclops/evilcraft/blockentity/BlockEntitySanguinaryEnvironmentalAccumulator.java b/...java/org/cyclops/evilcraft/blockentity/BlockEntitySanguinaryEnvironmentalAccumulator.java
@@ -31,11 +31,7 @@
 import org.apache.commons.lang3.tuple.Triple;
 import org.cyclops.cyclopscore.capability.item.ItemHandlerSlotMasked;
 import org.cyclops.cyclopscore.datastructure.SingleCache;
-import org.cyclops.cyclopscore.helper.BlockEntityHelpers;
-import org.cyclops.cyclopscore.helper.CraftingHelpers;
-import org.cyclops.cyclopscore.helper.LocationHelpers;
-import org.cyclops.cyclopscore.helper.MinecraftHelpers;
-import org.cyclops.cyclopscore.helper.WorldHelpers;
+import org.cyclops.cyclopscore.helper.*;
 import org.cyclops.cyclopscore.inventory.SimpleInventory;
 import org.cyclops.evilcraft.RegistryEntries;
 import org.cyclops.evilcraft.block.BlockSanguinaryEnvironmentalAccumulator;
@@ -295,7 +291,7 @@ public Metadata getTileWorkingMetadata() {
 
     @Override
     public boolean canWork() {
-        if(!forceLoadTanks && invalidLocations != null && !WorldHelpers.efficientTick(level, TANK_CHECK_TICK_OFFSET, getBlockPos())) {
+        if(!forceLoadTanks && invalidLocations != null && (level.isClientSide() || !WorldHelpers.efficientTick(level, TANK_CHECK_TICK_OFFSET, getBlockPos()))) {
             return invalidLocations.isEmpty();
         }
         forceLoadTanks = false;