Only fill items on the serverside

SlimeKnights · Apr 25, 2021 · 531415c · 531415c
1 parent 9d951ab
commit 531415c
Showing 1 changed file with 23 additions and 20 deletions.
diff --git a/src/main/java/slimeknights/tconstruct/library/fluid/FluidTransferUtil.java b/src/main/java/slimeknights/tconstruct/library/fluid/FluidTransferUtil.java
@@ -107,26 +107,29 @@ public static boolean interactWithFluidItem(World world, BlockPos pos, PlayerEnt
     Direction face = hit.getFace();
     // fetch capability before copying, bit more work when its a fluid handler, but saves copying time when its not
     if (stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY).isPresent()) {
-      TileEntity te = world.getTileEntity(pos);
-      if (te != null) {
-        LazyOptional<IFluidHandler> teCapability = te.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, face);
-        if (teCapability.isPresent()) {
-          IFluidHandler teHandler = teCapability.orElse(EmptyFluidHandler.INSTANCE);
-          ItemStack copy = ItemHandlerHelper.copyStackWithSize(stack, 1);
-          copy.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY).ifPresent(itemHandler -> {
-            // first, try filling the TE from the item
-            boolean isSuccess = false;
-            if (tryTransfer(teHandler, itemHandler, Integer.MAX_VALUE)) {
-              isSuccess = true;
-              // if that failed, try filling the item handler from the TE
-            } else if (tryTransfer(itemHandler, teHandler, Integer.MAX_VALUE)) {
-              isSuccess = true;
-            }
-            // if either worked, update the player's inventory
-            if (isSuccess) {
-              player.setHeldItem(hand, DrinkHelper.fill(stack, player, itemHandler.getContainer()));
-            }
-          });
+      // only server needs to transfer stuff
+      if (!world.isRemote) {
+        TileEntity te = world.getTileEntity(pos);
+        if (te != null) {
+          LazyOptional<IFluidHandler> teCapability = te.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, face);
+          if (teCapability.isPresent()) {
+            IFluidHandler teHandler = teCapability.orElse(EmptyFluidHandler.INSTANCE);
+            ItemStack copy = ItemHandlerHelper.copyStackWithSize(stack, 1);
+            copy.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY).ifPresent(itemHandler -> {
+              // first, try filling the TE from the item
+              boolean isSuccess = false;
+              if (tryTransfer(teHandler, itemHandler, Integer.MAX_VALUE)) {
+                isSuccess = true;
+                // if that failed, try filling the item handler from the TE
+              } else if (tryTransfer(itemHandler, teHandler, Integer.MAX_VALUE)) {
+                isSuccess = true;
+              }
+              // if either worked, update the player's inventory
+              if (isSuccess) {
+                player.setHeldItem(hand, DrinkHelper.fill(stack, player, itemHandler.getContainer()));
+              }
+            });
+          }
         }
       }
       return true;