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

Merge branch 'master' of git@github.com:StevenRS11/DimDoors.git into 1.5udpate

Browse Source 
Conflicts:
	StevenDimDoors/mod_pocketDim/EventHookContainer.java
	StevenDimDoors/mod_pocketDim/mod_pocketDim.java
This commit is contained in:
StevenRS11
2013-04-01 04:04:59 -04:00
parent fb8ead5e06 f9c1e41677
commit d3123a33f2
14 changed files with 101 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java
View File

@@ -81,7 +81,6 @@ public class CommandDeleteAllLinks extends CommandBase
targetWorld = dimHelper.getWorld(targetDim);
{
dimHelper.instance.linksForRendering.remove(link);
dim.removeLinkAtCoords(link);

2
StevenDimDoors/mod_pocketDim/commands/CommandDeleteDimData.java
View File

@@ -73,12 +73,10 @@ public class CommandDeleteDimData extends CommandBase
if(link.destDimID==targetDim)
{
dimHelper.dimList.get(link.locDimID).removeLinkAtCoords(link);
dimHelper.instance.linksForRendering.remove(link);
linksRemoved++;
}
if(dimData.dimID==targetDim)
{
dimHelper.instance.linksForRendering.remove(link);
linksRemoved++;
}
}

1
StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java
View File

@@ -81,7 +81,6 @@ public class CommandDeleteRifts extends CommandBase
if(targetWorld.getBlockId(link.locXCoord, link.locYCoord, link.locZCoord)==mod_pocketDim.blockRiftID)
{
dimHelper.instance.linksForRendering.remove(link);
dim.removeLinkAtCoords(link);

2
StevenDimDoors/mod_pocketDim/commands/CommandPrintDimData.java
View File

@@ -71,12 +71,10 @@ public class CommandPrintDimData extends CommandBase
if(link.destDimID==targetDim)
{
dimHelper.dimList.get(link.locDimID).removeLinkAtCoords(link);
dimHelper.instance.linksForRendering.remove(link);
linksRemoved++;
}
if(dimData.dimID==targetDim)
{
dimHelper.instance.linksForRendering.remove(link);
linksRemoved++;
}
}