lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pushing before merging

Browse source
This commit is contained in:
WayofTime 2014-10-09 07:48:45 -04:00
parent 297567a417
commit 1d99b70f14
31 changed files with 588 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

3
1.7.10/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TETeleposer.java
View file

@ -191,6 +191,7 @@ public class TETeleposer extends TileEntity implements IInventory
public void updateEntity()
{
super.updateEntity();
EntityPlayer d;
if (worldObj.isRemote)
{
@ -281,6 +282,7 @@ public class TETeleposer extends TileEntity implements IInventory
entityplayer1 = (EntityLivingBase) iterator1.next();
entityplayer1.worldObj = worldF;
entityplayer1.setPositionAndUpdate(entityplayer1.posX - this.xCoord + xf, entityplayer1.posY - this.yCoord + yf, entityplayer1.posZ - this.zCoord + zf);
//entityplayer1.travelToDimension(worldF.provider.dimensionId);
}
while (iterator2.hasNext())
@ -288,6 +290,7 @@ public class TETeleposer extends TileEntity implements IInventory
entityplayer2 = (EntityLivingBase) iterator2.next();
entityplayer2.worldObj = worldF;
entityplayer2.setPositionAndUpdate(entityplayer2.posX + this.xCoord - xf, entityplayer2.posY + this.yCoord - yf, entityplayer2.posZ + this.zCoord - zf);
//entityplayer2.travelToDimension(worldObj.provider.dimensionId);
}
}
}