fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Crash in Formation Plane.

Browse Source 
Fixed Bug: #0166 - Combination TPane and FPane seems getting stuck
This commit is contained in:
AlgorithmX2
2014-02-18 23:26:43 -06:00
parent 85b053f6b5
commit 97ae2b78e3
3 changed files with 158 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parts/automation/PartFormationPlane.java
+51 -10
View File
@@ -26,6 +26,7 @@ import appeng.api.config.Upgrades;
import appeng.api.networking.events.MENetworkCellArrayUpdate;
import appeng.api.networking.events.MENetworkChannelsChanged;
import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.networking.security.BaseActionSource;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollsionHelper;
@@ -96,6 +97,17 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
return super.getInventoryByName( name );
}
@MENetworkEventSubscribe
public void powerRender(MENetworkPowerStatusChange c)
{
boolean currentActive = proxy.isActive();
if ( wasActive != currentActive )
{
wasActive = currentActive;
updateHandler();// proxy.getGrid().postEvent( new MENetworkCellArrayUpdate() );
}
}
@MENetworkEventSubscribe
public void updateChannels(MENetworkChannelsChanged chann)
{
@@ -103,14 +115,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
if ( wasActive != currentActive )
{
wasActive = currentActive;
try
{
proxy.getGrid().postEvent( new MENetworkCellArrayUpdate() );
}
catch (GridAccessException e)
{
// :P
}
updateHandler();// proxy.getGrid().postEvent( new MENetworkCellArrayUpdate() );
}
}
@@ -375,8 +380,42 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
if ( i instanceof ItemBlock || i instanceof IPlantable )
{
EntityPlayer player = Platform.getPlayer( (WorldServer) w );
player.prevCameraPitch = player.cameraPitch = 0;
player.prevCameraYaw = player.cameraYaw = 0;
float pitch = 0.0f, yaw = 0.0f;
player.yOffset = 1.8f;
switch (side)
{
case DOWN:
pitch = 90.0f;
player.yOffset = -1.8f;
break;
case EAST:
yaw = -90.0f;
break;
case NORTH:
yaw = 180.0f;
break;
case SOUTH:
yaw = 0.0f;
break;
case UNKNOWN:
break;
case UP:
pitch = 90.0f;
break;
case WEST:
yaw = 90.0f;
break;
}
player.posX = (float) tile.xCoord + 0.5;
player.posY = (float) tile.yCoord + 0.5;
player.posZ = (float) tile.zCoord + 0.5;
player.rotationPitch = player.prevCameraPitch = player.cameraPitch = pitch;
player.rotationYaw = player.prevCameraYaw = player.cameraYaw = yaw;
maxStorage = is.stackSize;
worked = true;
if ( type == Actionable.MODULATE )
@@ -415,6 +454,8 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
{
IAEItemStack out = input.copy();
out.decStackSize( maxStorage );
if ( out.getStackSize() == 0 )
return null;
return out;
}