apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

fixed dimHatch bug

Browse Source 
Signed-off-by: StevenRS11 <stevenrs11@aol.com>
This commit is contained in:
StevenRS11
2013-04-17 15:59:15 -04:00
parent 3579070eb9
commit be459b62b3
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
StevenDimDoors/mod_pocketDim/blocks/dimHatch.java
View File

@@ -56,6 +56,8 @@ public class dimHatch extends BlockTrapDoor
DimData dimData = (DimData) dimHelper.instance.dimList.get(par1World.provider.dimensionId); DimData dimData = (DimData) dimHelper.instance.dimList.get(par1World.provider.dimensionId);
LinkData exitLink=dimData.exitDimLink; LinkData exitLink=dimData.exitDimLink;
exitLink.locDimID=par1World.provider.dimensionId;
dimHelper.instance.teleportToPocket(par1World, exitLink, par5Entity); dimHelper.instance.teleportToPocket(par1World, exitLink, par5Entity);

9
StevenDimDoors/mod_pocketDim/dimHelper.java
View File

@@ -235,7 +235,6 @@ public class dimHelper extends DimensionManager
} }
player.playerNetServerHandler.sendPacketToPlayer(new Packet43Experience(player.experience, player.experienceTotal, player.experienceLevel)); player.playerNetServerHandler.sendPacketToPlayer(new Packet43Experience(player.experience, player.experienceTotal, player.experienceLevel));
WorldServer.class.cast(newWorld).theChunkProviderServer.loadChunk(MathHelper.floor_double(entity.posX) >> 4, MathHelper.floor_double(entity.posZ) >> 4);
@@ -305,7 +304,10 @@ public class dimHelper extends DimensionManager
} }
if(entity instanceof EntityPlayerMP)
{
WorldServer.class.cast(newWorld).theChunkProviderServer.loadChunk(MathHelper.floor_double(entity.posX) >> 4, MathHelper.floor_double(entity.posZ) >> 4);
}
return entity; return entity;
@@ -329,6 +331,7 @@ public class dimHelper extends DimensionManager
{ {
int destinationID=linkData.destDimID; int destinationID=linkData.destDimID;
int x=linkData.destXCoord; int x=linkData.destXCoord;
int y=linkData.destYCoord; int y=linkData.destYCoord;
int z=linkData.destZCoord; int z=linkData.destZCoord;
@@ -895,7 +898,7 @@ public class dimHelper extends DimensionManager
if(link1!=null) if(link1!=null)
{ {
locationDimData.exitDimLink=new LinkData(link1.locDimID, link1.locDimID, link1.locXCoord, link1.locYCoord, link1.locZCoord, link1.locXCoord, link1.locYCoord, link1.locZCoord, false); // locationDimData.exitDimLink=new LinkData(link1.locDimID, link1.locDimID, link1.locXCoord, link1.locYCoord, link1.locZCoord, link1.locXCoord, link1.locYCoord, link1.locZCoord, false);
} }
} }

6
StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java
View File

@@ -98,8 +98,12 @@ public class ItemStabilizedRiftSignature extends itemLinkSignature
} }
if(hasEnder&&!par3World.isRemote) if(hasEnder&&!par3World.isRemote)
{ {
if(dimHelper.instance.getLinkDataFromCoords(linkCoords[0], linkCoords[1], linkCoords[2], par3World)==null)
{
dimHelper.instance.createLink(linkCoords[3], par3World.provider.dimensionId, linkCoords[0], linkCoords[1], linkCoords[2],par4, par5+offset, par6);
}
dimHelper.instance.createLink(par3World.provider.dimensionId, linkCoords[3], par4, par5+offset, par6, linkCoords[0], linkCoords[1], linkCoords[2]); dimHelper.instance.createLink(par3World.provider.dimensionId, linkCoords[3], par4, par5+offset, par6, linkCoords[0], linkCoords[1], linkCoords[2]);
dimHelper.instance.createLink(linkCoords[3], par3World.provider.dimensionId, linkCoords[0], linkCoords[1], linkCoords[2],par4, par5+offset, par6);
par2EntityPlayer.sendChatToPlayer("Rift Created"); par2EntityPlayer.sendChatToPlayer("Rift Created");
} }
else if(!par3World.isRemote) else if(!par3World.isRemote)

8
StevenDimDoors/mod_pocketDim/mod_pocketDim.java
View File

@@ -297,7 +297,7 @@ public class mod_pocketDim
blockLimboID=config.get("Int", "Block ID for Limbo- must be below 256", 217).getInt(); blockLimboID=config.get("Int", "Block ID for Limbo- must be below 256", 217).getInt();
blockDimWallPermID=config.get("Int", "Block ID for blockDimWallPermID- must be below 256", 220).getInt(); blockDimWallPermID=config.get("Int", "Block ID for blockDimWallPermID- must be below 256", 220).getInt();
this.limboDimID=config.get("Int", "Limbo Dimension ID", -23).getInt(); this.limboDimID=config.get("Int", "Limbo Dimension ID", -23).getInt();
this.limboExitRange=config.get("Int", "The farthest possible distance that limbo can send you upon return to the overworld.", 100000).getInt(); this.limboExitRange=config.get("Int", "The farthest possible distance that limbo can send you upon return to the overworld.", 500).getInt();
providerID=config.get("Int", "ProviderID", 12).getInt(); providerID=config.get("Int", "ProviderID", 12).getInt();
this.limboProviderID=config.get("Int", "Limbo Provider ID", 13).getInt(); this.limboProviderID=config.get("Int", "Limbo Provider ID", 13).getInt();
@@ -342,7 +342,7 @@ public class mod_pocketDim
itemStableFabric = (new ItemStableFabric(itemStableFabricID, 0)).setUnlocalizedName("itemStableFabric"); itemStableFabric = (new ItemStableFabric(itemStableFabricID, 0)).setUnlocalizedName("itemStableFabric");
itemChaosDoor = (new ItemChaosDoor(itemChaosDoorID, Material.iron)).setUnlocalizedName("itemChaosDoor"); itemChaosDoor = (new ItemChaosDoor(itemChaosDoorID, Material.iron)).setUnlocalizedName("itemChaosDoor");
itemRiftBlade = (new ItemRiftBlade(itemRiftBladeID, Material.iron)).setUnlocalizedName("ItemRiftBlade"); itemRiftBlade = (new ItemRiftBlade(itemRiftBladeID, Material.iron)).setUnlocalizedName("ItemRiftBlade");
itemStabilizedLinkSignature = (new ItemStabilizedRiftSignature(itemStabilizedLinkSignatureID)).setUnlocalizedName("itemStabilizedRiftSig"); // itemStabilizedLinkSignature = (new ItemStabilizedRiftSignature(itemStabilizedLinkSignatureID)).setUnlocalizedName("itemStabilizedRiftSig");
proxy.loadTextures(); proxy.loadTextures();
@@ -387,7 +387,7 @@ public class mod_pocketDim
LanguageRegistry.addName(itemExitDoor , "Warp Door"); LanguageRegistry.addName(itemExitDoor , "Warp Door");
LanguageRegistry.addName(itemLinkSignature , "Rift Signature"); LanguageRegistry.addName(itemLinkSignature , "Rift Signature");
LanguageRegistry.addName(itemStabilizedLinkSignature, "Stabilized Rift Signature"); // LanguageRegistry.addName(itemStabilizedLinkSignature, "Stabilized Rift Signature");
LanguageRegistry.addName(itemRiftRemover , "Rift Remover"); LanguageRegistry.addName(itemRiftRemover , "Rift Remover");
LanguageRegistry.addName(itemStableFabric , "Stable Fabric"); LanguageRegistry.addName(itemStableFabric , "Stable Fabric");
LanguageRegistry.addName(itemChaosDoor , "Unstable Door"); LanguageRegistry.addName(itemChaosDoor , "Unstable Door");
@@ -584,6 +584,8 @@ public class mod_pocketDim
this.pistonTraps.add(new DungeonGenerator(0, "simpleDropHall.schematic", null)); this.pistonTraps.add(new DungeonGenerator(0, "simpleDropHall.schematic", null));
this.pistonTraps.add(new DungeonGenerator(0, "wallFallcomboPistonHall.schematic", null)); this.pistonTraps.add(new DungeonGenerator(0, "wallFallcomboPistonHall.schematic", null));
this.pistonTraps.add(new DungeonGenerator(0, "wallFallcomboPistonHall.schematic", null)); this.pistonTraps.add(new DungeonGenerator(0, "wallFallcomboPistonHall.schematic", null));
this.pistonTraps.add(new DungeonGenerator(0, "lavaPyramid.schematic", null));
this.mazes.add(new DungeonGenerator(0, "smallMaze1.schematic", null)); this.mazes.add(new DungeonGenerator(0, "smallMaze1.schematic", null));