From 324d49e3ac9fee3464c60c01c7d50291694b5e92 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 30 Apr 2017 17:20:17 -0700 Subject: [PATCH] Sanity check pos passed by client Prevents malicious clients from loading arbitrary chunks. Thanks to pau101 for spotting it. (cherry picked from commit 7c19e2e) --- .../bloodmagic/network/ItemRouterAmountPacketProcessor.java | 3 +++ .../bloodmagic/network/ItemRouterButtonPacketProcessor.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/WayofTime/bloodmagic/network/ItemRouterAmountPacketProcessor.java b/src/main/java/WayofTime/bloodmagic/network/ItemRouterAmountPacketProcessor.java index debc75e3..d6cc57b8 100644 --- a/src/main/java/WayofTime/bloodmagic/network/ItemRouterAmountPacketProcessor.java +++ b/src/main/java/WayofTime/bloodmagic/network/ItemRouterAmountPacketProcessor.java @@ -67,6 +67,9 @@ public class ItemRouterAmountPacketProcessor implements IMessage, IMessageHandle World world = DimensionManager.getWorld(dimension); if (world != null) { + if (!world.isBlockLoaded(pos)) + return; + TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileFilteredRoutingNode) { diff --git a/src/main/java/WayofTime/bloodmagic/network/ItemRouterButtonPacketProcessor.java b/src/main/java/WayofTime/bloodmagic/network/ItemRouterButtonPacketProcessor.java index d3b3dcf8..905af75a 100644 --- a/src/main/java/WayofTime/bloodmagic/network/ItemRouterButtonPacketProcessor.java +++ b/src/main/java/WayofTime/bloodmagic/network/ItemRouterButtonPacketProcessor.java @@ -63,6 +63,9 @@ public class ItemRouterButtonPacketProcessor implements IMessage, IMessageHandle World world = DimensionManager.getWorld(dimension); if (world != null) { + if (!world.isBlockLoaded(pos)) + return; + TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileFilteredRoutingNode) {