Merge branch 'master' into DungeonPacks
This commit is contained in:
commit
99d9b5a2a1
1 changed files with 16 additions and 22 deletions
|
@ -46,21 +46,20 @@ public class EventHookContainer
|
||||||
dimHelper.instance.interDimLinkList.clear();
|
dimHelper.instance.interDimLinkList.clear();
|
||||||
dimHelper.instance.initPockets();
|
dimHelper.instance.initPockets();
|
||||||
}
|
}
|
||||||
for (Integer ids : dimHelper.getIDs())
|
|
||||||
|
//TODO: In the future, we should iterate over DimHelper's dimension list. We ignore other dimensions anyway.
|
||||||
|
for (int dimensionID : dimHelper.getIDs())
|
||||||
{
|
{
|
||||||
World world = dimHelper.getWorld(ids);
|
World world = dimHelper.getWorld(dimensionID);
|
||||||
int linkCount = 0;
|
int linkCount = 0;
|
||||||
|
|
||||||
if (dimHelper.dimList.containsKey(world.provider.dimensionId))
|
if (dimHelper.dimList.containsKey(dimensionID))
|
||||||
{
|
{
|
||||||
//TODO added temporary Try/catch block to prevent a crash here, getLinksInDim needs to be looked at
|
for (LinkData link : dimHelper.instance.getDimData(dimensionID).getLinksInDim())
|
||||||
try
|
|
||||||
{
|
|
||||||
for (LinkData link:dimHelper.instance.getDimData(world.provider.dimensionId).getLinksInDim())
|
|
||||||
{
|
{
|
||||||
if (!mod_pocketDim.blockRift.isBlockImmune(world, link.locXCoord, link.locYCoord, link.locZCoord))
|
if (!mod_pocketDim.blockRift.isBlockImmune(world, link.locXCoord, link.locYCoord, link.locZCoord))
|
||||||
{
|
{
|
||||||
dimHelper.getWorld(link.locDimID).setBlock(link.locXCoord, link.locYCoord, link.locZCoord, properties.RiftBlockID);
|
world.setBlock(link.locXCoord, link.locYCoord, link.locZCoord, properties.RiftBlockID);
|
||||||
}
|
}
|
||||||
linkCount++;
|
linkCount++;
|
||||||
if (linkCount >= 100)
|
if (linkCount >= 100)
|
||||||
|
@ -69,11 +68,6 @@ public class EventHookContainer
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch(Exception e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue