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

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
14 changed files with 101 additions and 99 deletions

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);