dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Network Transmitters being able to connect to any network device. Fixes #2440

Browse Source
This commit is contained in:
raoulvdberge
2020-07-17 03:27:20 +02:00
parent dbf77e1d46
commit 1c47c57b82
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -3,6 +3,7 @@
### 1.9.2 ### 1.9.2
- Fixed crash with Forge version 67 (Darkere) - Fixed crash with Forge version 67 (Darkere)
- Fixed cases where Refined Storage unwillingly acts like a chunkloader (raoulvdberge) - Fixed cases where Refined Storage unwillingly acts like a chunkloader (raoulvdberge)
- Fixed Network Transmitters being able to connect to any network device (raoulvdberge)
- Networks that are in a chunk that isn't loaded will no longer work, they will turn off. Chunkload the Controller to maintain a functioning network over long distances (Darkere/raoulvdberge) - Networks that are in a chunk that isn't loaded will no longer work, they will turn off. Chunkload the Controller to maintain a functioning network over long distances (Darkere/raoulvdberge)
- Re-added interdimensional networks with the Network Transmitter and Network Receiver (raoulvdberge) - Re-added interdimensional networks with the Network Transmitter and Network Receiver (raoulvdberge)
- Re-added MouseTweaks integration (raoulvdberge) - Re-added MouseTweaks integration (raoulvdberge)

10
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java
View File

@@ -8,6 +8,7 @@ import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler;
import com.refinedmods.refinedstorage.inventory.item.validator.ItemValidator; import com.refinedmods.refinedstorage.inventory.item.validator.ItemValidator;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener;
import com.refinedmods.refinedstorage.item.NetworkCardItem; import com.refinedmods.refinedstorage.item.NetworkCardItem;
import com.refinedmods.refinedstorage.tile.NetworkReceiverTile;
import com.refinedmods.refinedstorage.util.StackUtils; import com.refinedmods.refinedstorage.util.StackUtils;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
@@ -83,11 +84,6 @@ public class NetworkTransmitterNetworkNode extends NetworkNode {
return networkCard; return networkCard;
} }
@Nullable
public BlockPos getReceiver() {
return receiver;
}
@Nullable @Nullable
public RegistryKey<World> getReceiverDimension() { public RegistryKey<World> getReceiverDimension() {
return receiverDimension; return receiverDimension;
@@ -122,12 +118,14 @@ public class NetworkTransmitterNetworkNode extends NetworkNode {
if (!isSameDimension()) { if (!isSameDimension()) {
World dimensionWorld = world.getServer().getWorld(receiverDimension); World dimensionWorld = world.getServer().getWorld(receiverDimension);
if (dimensionWorld != null) { if (dimensionWorld != null && dimensionWorld.getTileEntity(receiver) instanceof NetworkReceiverTile) {
operator.apply(dimensionWorld, receiver, null); operator.apply(dimensionWorld, receiver, null);
} }
} else { } else {
if (world.getTileEntity(receiver) instanceof NetworkReceiverTile) {
operator.apply(world, receiver, null); operator.apply(world, receiver, null);
} }
} }
} }
} }
}