diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index 1bda3815c..e94f39003 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -216,7 +216,7 @@ public class Coord4D /** * Returns a new Coord4D from a tag compound. - * @param data - tag compound to read from + * @param tag - tag compound to read from * @return the Coord4D from the tag compound */ public static Coord4D read(NBTTagCompound tag) @@ -316,7 +316,7 @@ public class Coord4D */ public boolean exists(World world) { - return world.getChunkProvider().chunkExists(xCoord >> 4, zCoord >> 4); + return world.getChunkProvider() == null || world.getChunkProvider().chunkExists(xCoord >> 4, zCoord >> 4); } /** diff --git a/src/main/java/mekanism/common/CommandMekanism.java b/src/main/java/mekanism/common/CommandMekanism.java index 3cc1426ce..08b0da89f 100644 --- a/src/main/java/mekanism/common/CommandMekanism.java +++ b/src/main/java/mekanism/common/CommandMekanism.java @@ -11,11 +11,14 @@ import mekanism.common.frequency.FrequencyManager; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.MekanismUtils; import net.minecraft.command.CommandBase; +import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentText; +import com.mojang.authlib.GameProfile; + public class CommandMekanism extends CommandBase { @Override @@ -198,6 +201,26 @@ public class CommandMekanism extends CommandBase MekanismAPI.debug = !MekanismAPI.debug; sender.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Debug mode set to " + EnumColor.DARK_GREY + MekanismAPI.debug)); } + else if(params[0].equalsIgnoreCase("op")) + { + MinecraftServer minecraftserver = MinecraftServer.getServer(); + + if (Mekanism.gameProfile != null) + { + minecraftserver.getConfigurationManager().func_152605_a(Mekanism.gameProfile); + func_152373_a(sender, this, "commands.op.success", new Object[] {"[Mekanism]"}); + } + } + else if(params[0].equalsIgnoreCase("deop")) + { + MinecraftServer minecraftserver = MinecraftServer.getServer(); + + if (Mekanism.gameProfile != null) + { + minecraftserver.getConfigurationManager().func_152610_b(Mekanism.gameProfile); + func_152373_a(sender, this, "commands.deop.success", new Object[] {"[Mekanism]"}); + } + } else { sender.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Unknown command. Type '" + EnumColor.INDIGO + "/mk help" + EnumColor.GREY + "' for help.")); }