moar fixes

oopsie
Geforce132 · Dec 22, 2017 · d5f8bb2 · d5f8bb2
1 parent 0f81465
commit d5f8bb2
Show file tree

Hide file tree

Showing 61 changed files with 113 additions and 112 deletions.
diff --git a/...2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketGivePotionEffect.java b/...2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketGivePotionEffect.java
@@ -1,6 +1,7 @@
 package net.geforcemods.securitycraft.network.packets;
 
 import io.netty.buffer.ByteBuf;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
@@ -39,7 +40,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketGivePotionEffect packet, MessageContext ctx) {
-			ctx.getServerHandler().playerEntity.addPotionEffect(new PotionEffect(Potion.getPotionById(packet.potionID), packet.duration, packet.amplifier, false, true));
+			WorldUtils.addScheduledTask(getWorld(ctx.getServerHandler().playerEntity), () -> ctx.getServerHandler().playerEntity.addPotionEffect(new PotionEffect(Potion.getPotionById(packet.potionID), packet.duration, packet.amplifier, false, true)));
 			return null;
 		}
 

diff --git a/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSAddModules.java b/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSAddModules.java
@@ -4,7 +4,7 @@
 import net.geforcemods.securitycraft.api.CustomizableSCTE;
 import net.geforcemods.securitycraft.misc.EnumCustomModules;
 import net.geforcemods.securitycraft.util.BlockUtils;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
@@ -59,7 +59,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketSAddModules packet, MessageContext context) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(context.getServerHandler().playerEntity), () -> {
 				BlockPos pos = BlockUtils.toPos(packet.x, packet.y, packet.z);
 				ItemStack[] modules = packet.modules;
 				EntityPlayer par1EntityPlayer = context.getServerHandler().playerEntity;

diff --git a/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSCheckPassword.java b/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSCheckPassword.java
@@ -3,7 +3,7 @@
 import io.netty.buffer.ByteBuf;
 import net.geforcemods.securitycraft.api.IPasswordProtected;
 import net.geforcemods.securitycraft.util.BlockUtils;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.util.math.BlockPos;
@@ -48,7 +48,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketSCheckPassword packet, MessageContext ctx) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(ctx.getServerHandler().playerEntity), () -> {
 				BlockPos pos = BlockUtils.toPos(packet.x, packet.y, packet.z);
 				String password = packet.password;
 				EntityPlayer player = ctx.getServerHandler().playerEntity;

diff --git a/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSMountCamera.java b/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSMountCamera.java
@@ -3,7 +3,7 @@
 import io.netty.buffer.ByteBuf;
 import net.geforcemods.securitycraft.blocks.BlockSecurityCamera;
 import net.geforcemods.securitycraft.util.BlockUtils;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
@@ -47,7 +47,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketSMountCamera packet, MessageContext context) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(context.getServerHandler().playerEntity), () -> {
 				int x = packet.x;
 				int y = packet.y;
 				int z = packet.z;

diff --git a/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSOpenGui.java b/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSOpenGui.java
@@ -2,7 +2,7 @@
 
 import io.netty.buffer.ByteBuf;
 import net.geforcemods.securitycraft.main.mod_SecurityCraft;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
@@ -44,7 +44,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketSOpenGui packet, MessageContext context) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(context.getServerHandler().playerEntity), () -> {
 				int id = packet.id;
 				int x = packet.x;
 				int y = packet.y;

diff --git a/...2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSRemoveCameraTag.java b/...2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSRemoveCameraTag.java
@@ -2,7 +2,7 @@
 
 import io.netty.buffer.ByteBuf;
 import net.geforcemods.securitycraft.items.ItemCameraMonitor;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
@@ -41,7 +41,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 		@Override
 		public IMessage onMessage(PacketSRemoveCameraTag packet, MessageContext context)
 		{
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(context.getServerHandler().playerEntity), () -> {
 				ItemStack monitor = context.getServerHandler().playerEntity.inventory.getCurrentItem();
 				int id = packet.camID;
 

diff --git a/...src/main/java/net/geforcemods/securitycraft/network/packets/PacketSSetCameraRotation.java b/...src/main/java/net/geforcemods/securitycraft/network/packets/PacketSSetCameraRotation.java
@@ -2,7 +2,7 @@
 
 import io.netty.buffer.ByteBuf;
 import net.geforcemods.securitycraft.entity.EntitySecurityCamera;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
@@ -37,7 +37,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketSSetCameraRotation packet, MessageContext ctx) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(ctx.getServerHandler().playerEntity), () -> {
 				EntityPlayer player = ctx.getServerHandler().playerEntity;
 
 				if(player.getRidingEntity() != null && player.getRidingEntity() instanceof EntitySecurityCamera){

diff --git a/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSSetOwner.java b/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSSetOwner.java
@@ -3,7 +3,7 @@
 import io.netty.buffer.ByteBuf;
 import net.geforcemods.securitycraft.api.IOwnable;
 import net.geforcemods.securitycraft.util.BlockUtils;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
@@ -50,7 +50,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketSSetOwner packet, MessageContext ctx) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(ctx.getServerHandler().playerEntity), () -> {
 				BlockPos pos = BlockUtils.toPos(packet.x, packet.y, packet.z);
 				EntityPlayer player = ctx.getServerHandler().playerEntity;
 				if(getWorld(player).getTileEntity(pos) != null && getWorld(player).getTileEntity(pos) instanceof IOwnable)

diff --git a/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSSetPassword.java b/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSSetPassword.java
@@ -4,7 +4,7 @@
 import net.geforcemods.securitycraft.api.IPasswordProtected;
 import net.geforcemods.securitycraft.tileentity.TileEntityKeypadChest;
 import net.geforcemods.securitycraft.util.BlockUtils;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
@@ -48,7 +48,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketSSetPassword packet, MessageContext ctx) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(ctx.getServerHandler().playerEntity), () -> {
 				BlockPos pos = BlockUtils.toPos(packet.x, packet.y, packet.z);
 				String password = packet.password;
 				EntityPlayer player = ctx.getServerHandler().playerEntity;

diff --git a/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSSyncTENBTTag.java b/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSSyncTENBTTag.java
@@ -2,7 +2,7 @@
 
 import io.netty.buffer.ByteBuf;
 import net.geforcemods.securitycraft.util.BlockUtils;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.math.BlockPos;
@@ -47,7 +47,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketSSyncTENBTTag packet, MessageContext ctx) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(ctx.getServerHandler().playerEntity), () -> {
 				BlockPos pos = BlockUtils.toPos(packet.x, packet.y, packet.z);
 				NBTTagCompound tag = packet.tag;
 				EntityPlayer player = ctx.getServerHandler().playerEntity;

diff --git a/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSToggleOption.java b/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSToggleOption.java
@@ -3,7 +3,7 @@
 import io.netty.buffer.ByteBuf;
 import net.geforcemods.securitycraft.api.CustomizableSCTE;
 import net.geforcemods.securitycraft.util.BlockUtils;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
@@ -43,7 +43,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketSToggleOption packet, MessageContext context) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(context.getServerHandler().playerEntity), () -> {
 				int x = packet.x;
 				int y = packet.y;
 				int z = packet.z;

diff --git a/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSUpdateNBTTag.java b/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSUpdateNBTTag.java
@@ -1,7 +1,7 @@
 package net.geforcemods.securitycraft.network.packets;
 
 import io.netty.buffer.ByteBuf;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
@@ -41,7 +41,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketSUpdateNBTTag packet, MessageContext context) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(context.getServerHandler().playerEntity), () -> {
 				if(context.getServerHandler().playerEntity.inventory.getCurrentItem() != null && context.getServerHandler().playerEntity.inventory.getCurrentItem().getItem().getUnlocalizedName().matches(packet.itemName))
 					context.getServerHandler().playerEntity.inventory.getCurrentItem().setTagCompound(packet.stack);
 			});

diff --git a/...src/main/java/net/geforcemods/securitycraft/network/packets/PacketSUpdateSliderValue.java b/...src/main/java/net/geforcemods/securitycraft/network/packets/PacketSUpdateSliderValue.java
@@ -3,7 +3,7 @@
 import io.netty.buffer.ByteBuf;
 import net.geforcemods.securitycraft.api.CustomizableSCTE;
 import net.geforcemods.securitycraft.api.Option.OptionDouble;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
@@ -42,7 +42,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketSUpdateSliderValue packet, MessageContext context) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(context.getServerHandler().playerEntity), () -> {
 				BlockPos pos = packet.pos;
 				int id = packet.id;
 				double value = packet.value;

diff --git a/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSetBlock.java b/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSetBlock.java
@@ -7,8 +7,8 @@
 import net.geforcemods.securitycraft.tileentity.TileEntityKeypadFurnace;
 import net.geforcemods.securitycraft.tileentity.TileEntityOwnable;
 import net.geforcemods.securitycraft.util.BlockUtils;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
@@ -57,7 +57,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 		//TODO
 		@Override
 		public IMessage onMessage(PacketSetBlock packet, MessageContext context) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(context.getServerHandler().playerEntity), () -> {
 				int x = packet.x;
 				int y = packet.y;
 				int z = packet.z;

diff --git a/.../src/main/java/net/geforcemods/securitycraft/network/packets/PacketSetExplosiveState.java b/.../src/main/java/net/geforcemods/securitycraft/network/packets/PacketSetExplosiveState.java
@@ -3,7 +3,7 @@
 import io.netty.buffer.ByteBuf;
 import net.geforcemods.securitycraft.api.IExplosive;
 import net.geforcemods.securitycraft.util.BlockUtils;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
@@ -46,7 +46,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketSetExplosiveState packet, MessageContext context) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(context.getServerHandler().playerEntity), () -> {
 				EntityPlayer player = context.getServerHandler().playerEntity;
 
 				if(BlockUtils.getBlock(getWorld(player), packet.x, packet.y, packet.z) != null && BlockUtils.getBlock(getWorld(player), packet.x, packet.y, packet.z) instanceof IExplosive)

diff --git a/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSetISType.java b/1.10.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSetISType.java
@@ -5,7 +5,7 @@
 import net.geforcemods.securitycraft.tileentity.TileEntityInventoryScanner;
 import net.geforcemods.securitycraft.util.BlockUtils;
 import net.geforcemods.securitycraft.util.Utils;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
@@ -50,7 +50,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketSetISType packet, MessageContext context) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(context.getServerHandler().playerEntity), () -> {
 				BlockPos pos = BlockUtils.toPos(packet.x, packet.y, packet.z);
 
 				((TileEntityInventoryScanner) getWorld(context.getServerHandler().playerEntity).getTileEntity(pos)).setType(packet.type);

diff --git a/....2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSetKeycardLevel.java b/....2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSetKeycardLevel.java
@@ -3,7 +3,7 @@
 import io.netty.buffer.ByteBuf;
 import net.geforcemods.securitycraft.tileentity.TileEntityKeycardReader;
 import net.geforcemods.securitycraft.util.BlockUtils;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
@@ -49,7 +49,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketSetKeycardLevel packet, MessageContext context) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(context.getServerHandler().playerEntity), () -> {
 				BlockPos pos = BlockUtils.toPos(packet.x, packet.y, packet.z);
 				int level = packet.level;
 				boolean exactCard = packet.exactCard;

diff --git a/1.11.2/src/main/java/net/geforcemods/securitycraft/gui/SecurityCraftGuiFactory.java b/1.11.2/src/main/java/net/geforcemods/securitycraft/gui/SecurityCraftGuiFactory.java
@@ -28,13 +28,11 @@ public Set<RuntimeOptionCategoryElement> runtimeGuiCategories() {
 		return null;
 	}
 
-	@Override
 	public boolean hasConfigGui()
 	{
 		return true;
 	}
 
-	@Override
 	public GuiScreen createConfigGui(GuiScreen parentScreen)
 	{
 		return new SecurityCraftConfigGUI(parentScreen);

diff --git a/...2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketGivePotionEffect.java b/...2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketGivePotionEffect.java
@@ -1,6 +1,7 @@
 package net.geforcemods.securitycraft.network.packets;
 
 import io.netty.buffer.ByteBuf;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
@@ -39,7 +40,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketGivePotionEffect packet, MessageContext ctx) {
-			ctx.getServerHandler().playerEntity.addPotionEffect(new PotionEffect(Potion.getPotionById(packet.potionID), packet.duration, packet.amplifier, false, true));
+			WorldUtils.addScheduledTask(getWorld(ctx.getServerHandler().playerEntity), () -> ctx.getServerHandler().playerEntity.addPotionEffect(new PotionEffect(Potion.getPotionById(packet.potionID), packet.duration, packet.amplifier, false, true)));
 			return null;
 		}
 

diff --git a/1.11.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSAddModules.java b/1.11.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSAddModules.java
@@ -4,7 +4,7 @@
 import net.geforcemods.securitycraft.api.CustomizableSCTE;
 import net.geforcemods.securitycraft.misc.EnumCustomModules;
 import net.geforcemods.securitycraft.util.BlockUtils;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
@@ -59,7 +59,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketSAddModules packet, MessageContext context) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(context.getServerHandler().playerEntity), () -> {
 				BlockPos pos = BlockUtils.toPos(packet.x, packet.y, packet.z);
 				ItemStack[] modules = packet.modules;
 				EntityPlayer par1EntityPlayer = context.getServerHandler().playerEntity;

diff --git a/1.11.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSCheckPassword.java b/1.11.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSCheckPassword.java
@@ -3,7 +3,7 @@
 import io.netty.buffer.ByteBuf;
 import net.geforcemods.securitycraft.api.IPasswordProtected;
 import net.geforcemods.securitycraft.util.BlockUtils;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.util.math.BlockPos;
@@ -48,7 +48,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketSCheckPassword packet, MessageContext ctx) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(ctx.getServerHandler().playerEntity), () -> {
 				BlockPos pos = BlockUtils.toPos(packet.x, packet.y, packet.z);
 				String password = packet.password;
 				EntityPlayer player = ctx.getServerHandler().playerEntity;

diff --git a/1.11.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSMountCamera.java b/1.11.2/src/main/java/net/geforcemods/securitycraft/network/packets/PacketSMountCamera.java
@@ -3,7 +3,7 @@
 import io.netty.buffer.ByteBuf;
 import net.geforcemods.securitycraft.blocks.BlockSecurityCamera;
 import net.geforcemods.securitycraft.util.BlockUtils;
-import net.minecraft.client.Minecraft;
+import net.geforcemods.securitycraft.util.WorldUtils;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
@@ -47,7 +47,7 @@ public static class Handler extends PacketHelper implements IMessageHandler<Pack
 
 		@Override
 		public IMessage onMessage(PacketSMountCamera packet, MessageContext context) {
-			Minecraft.getMinecraft().addScheduledTask(() -> {
+			WorldUtils.addScheduledTask(getWorld(context.getServerHandler().playerEntity), () -> {
 				int x = packet.x;
 				int y = packet.y;
 				int z = packet.z;