Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed door obstruction check to not trap people

Browse source
This commit is contained in:
StevenRS11 2013-09-11 02:51:49 -04:00
parent 78785047af
commit 670b9a2902
1 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
StevenDimDoors/mod_pocketDim/core/DDTeleporter.java
View file

@ -122,6 +122,37 @@ public class DDTeleporter
orientation = -1;
}
if(!CheckDestination(entity, world, destination, properties))
{
//TODO Give entity backwards acceleration
if(entity instanceof EntityPlayerMP)
{
EntityPlayer player = (EntityPlayer) entity;
player.rotationYaw=(orientation * 90)+90;
switch (orientation)
{
case 0:
player.setPositionAndUpdate(x + 0.5, y - 1, z + 0.5);
break;
case 1:
player.setPositionAndUpdate(x + 0.5, y - 1, z + 0.5);
break;
case 2:
player.setPositionAndUpdate(x + 0.5, y - 1, z + 0.5);
break;
case 3:
player.setPositionAndUpdate(x + 0.5, y - 1, z + .5);
break;
default:
player.setPositionAndUpdate(x, y - 1, z);
break;
}
}
}
if (entity instanceof EntityPlayer)
{
EntityPlayer player = (EntityPlayer) entity;
@ -274,17 +305,7 @@ public class DDTeleporter
{
newWorld = (WorldServer) oldWorld;
}
if(!CheckDestination(entity, newWorld, destination, properties))
{
//TODO Give entity backwards acceleration
if(entity instanceof EntityPlayerMP)
{
EntityPlayerMP.class.cast(entity).sendChatToPlayer("Destination blocked!!");
}
return entity;
}
// GreyMaria: What is this even accomplishing? We're doing the exact same thing at the end of this all.
// TODO Check to see if this is actually vital.