fixed instacrash

This commit is contained in:
StevenRS11
2013-06-11 00:41:40 -04:00
parent 000e0153b8
commit 43ead374cc
5 changed files with 50 additions and 6 deletions

View File

@@ -51,7 +51,7 @@ public class CommandEndDungeonCreation extends CommandBase
{ {
player.sendChatToPlayer("Must name file"); player.sendChatToPlayer("Must name file");
} }
else else if(!player.worldObj.isRemote)
{ {
DungeonData newDungeon = mod_pocketDim.dungeonHelper.exportDungeon(player.worldObj, x, y, z, mod_pocketDim.schematicContainer+"/"+var2[0]+".schematic"); DungeonData newDungeon = mod_pocketDim.dungeonHelper.exportDungeon(player.worldObj, x, y, z, mod_pocketDim.schematicContainer+"/"+var2[0]+".schematic");
player.sendChatToPlayer("created dungeon schematic in " +mod_pocketDim.schematicContainer+"/"+var2[0]+".schematic"); player.sendChatToPlayer("created dungeon schematic in " +mod_pocketDim.schematicContainer+"/"+var2[0]+".schematic");
@@ -59,7 +59,8 @@ public class CommandEndDungeonCreation extends CommandBase
if(mod_pocketDim.dungeonHelper.customDungeonStatus.containsKey(player.worldObj.provider.dimensionId)&&!player.worldObj.isRemote) if(mod_pocketDim.dungeonHelper.customDungeonStatus.containsKey(player.worldObj.provider.dimensionId)&&!player.worldObj.isRemote)
{ {
dimHelper.instance.teleportToPocket(player.worldObj, mod_pocketDim.dungeonHelper.customDungeonStatus.get(player.worldObj.provider.dimensionId), player); // mod_pocketDim.dungeonHelper.customDungeonStatus.remove(player.worldObj.provider.dimensionId);
// dimHelper.instance.teleportToPocket(player.worldObj, mod_pocketDim.dungeonHelper.customDungeonStatus.get(player.worldObj.provider.dimensionId), player);
} }
} }

View File

@@ -9,6 +9,8 @@ import StevenDimDoors.mod_pocketDim.LinkData;
import StevenDimDoors.mod_pocketDim.mod_pocketDim; import StevenDimDoors.mod_pocketDim.mod_pocketDim;
import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper; import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper;
import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.helpers.dimHelper;
import StevenDimDoors.mod_pocketDim.items.itemDimDoor;
import net.minecraft.block.Block;
import net.minecraft.command.CommandBase; import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender; import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@@ -37,10 +39,12 @@ public class CommandStartDungeonCreation extends CommandBase
LinkData link = new LinkData(player.worldObj.provider.dimensionId, 0, x, y+1, z, x, y+1, z, true, 3); LinkData link = new LinkData(player.worldObj.provider.dimensionId, 0, x, y+1, z, x, y+1, z, true, 3);
link = dimHelper.instance.createPocket(link,true, false); link = dimHelper.instance.createPocket(link,true, false);
itemDimDoor.placeDoorBlock(player.worldObj, x, y, z, 3, Block.blocksList[mod_pocketDim.ExitDoorID]);
dimHelper.instance.teleportToPocket(player.worldObj, link, player); // dimHelper.instance.teleportToPocket(player.worldObj, link, player);
mod_pocketDim.dungeonHelper.customDungeonStatus.put(player.worldObj.provider.dimensionId, dimHelper.instance.getLinkDataFromCoords(link.destXCoord, link.destYCoord, link.destZCoord, link.destDimID)); mod_pocketDim.dungeonHelper.customDungeonStatus.put(link.destDimID, dimHelper.instance.getLinkDataFromCoords(link.destXCoord, link.destYCoord, link.destZCoord, link.destDimID));
this.getCommandSenderAsPlayer(var1).sendChatToPlayer("DimID = "+ link.destDimID); this.getCommandSenderAsPlayer(var1).sendChatToPlayer("DimID = "+ link.destDimID);
} }

View File

@@ -367,6 +367,17 @@ public class DungeonHelper
int index = y * width * length + z * width + x; int index = y * width * length + z * width + x;
int blockID = world.getBlockId(x+xMin, y+yMin, z+zMin); int blockID = world.getBlockId(x+xMin, y+yMin, z+zMin);
int meta= world.getBlockMetadata(x+xMin, y+yMin, z+zMin); int meta= world.getBlockMetadata(x+xMin, y+yMin, z+zMin);
if(blockID==mod_pocketDim.dimDoorID)
{
blockID=Block.doorIron.blockID;
}
if(blockID==mod_pocketDim.ExitDoorID)
{
blockID=Block.doorWood.blockID;
}
// Save 4096 IDs in an AddBlocks section // Save 4096 IDs in an AddBlocks section
if (blockID > 255) { if (blockID > 255) {
if (addBlocks == null) { // Lazily create section if (addBlocks == null) { // Lazily create section

View File

@@ -49,6 +49,29 @@ public class ItemRiftBlade extends itemDimDoor
//TODO move to proxy //TODO move to proxy
} }
@SideOnly(Side.CLIENT)
public boolean isFull3D()
{
return true;
}
public float getStrVsBlock(ItemStack par1ItemStack, Block par2Block)
{
if (par2Block.blockID == Block.web.blockID)
{
return 15.0F;
}
else
{
Material material = par2Block.blockMaterial;
return material != Material.plants && material != Material.vine && material != Material.coral && material != Material.leaves && material != Material.pumpkin ? 1.0F : 1.5F;
}
}
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@Override @Override
public boolean hasEffect(ItemStack par1ItemStack) public boolean hasEffect(ItemStack par1ItemStack)

View File

@@ -10,6 +10,7 @@ import net.minecraft.world.WorldProvider;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.WorldChunkManagerHell; import net.minecraft.world.biome.WorldChunkManagerHell;
import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.storage.WorldInfo;
import net.minecraftforge.client.IRenderHandler; import net.minecraftforge.client.IRenderHandler;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@@ -85,7 +86,11 @@ public class LimboProvider extends WorldProvider
} }
} }
public ChunkCoordinates getSpawnPoint()
{
return this.getRandomizedSpawnPoint();
}
public float calculateCelestialAngle(long par1, float par3) public float calculateCelestialAngle(long par1, float par3)
{ {
@@ -162,7 +167,7 @@ public class LimboProvider extends WorldProvider
@Override @Override
public ChunkCoordinates getRandomizedSpawnPoint() public ChunkCoordinates getRandomizedSpawnPoint()
{ {
ChunkCoordinates var5 = new ChunkCoordinates(this.worldObj.getSpawnPoint()); ChunkCoordinates var5 = new ChunkCoordinates(0,0,0);
int spawnFuzz = 10000; int spawnFuzz = 10000;