tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Probably fixing doing things while looking at cables.

Browse source
This commit is contained in:
AlgorithmX2 2014-07-31 19:43:44 -05:00
parent c9ec498984
commit 608385fb29
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/Registration.java
View file

@ -539,7 +539,10 @@ public class Registration
FMLCommonHandler.instance().bus().register( TickHandler.instance );
MinecraftForge.EVENT_BUS.register( TickHandler.instance );
MinecraftForge.EVENT_BUS.register( new PartPlacement() );
PartPlacement pp = new PartPlacement();
MinecraftForge.EVENT_BUS.register( pp );
FMLCommonHandler.instance().bus().register( pp );
IGridCacheRegistry gcr = AEApi.instance().registries().gridCache();
gcr.registerGridCache( ITickManager.class, TickManagerCache.class );

13
parts/PartPlacement.java
View file

@ -37,11 +37,19 @@ import appeng.integration.abstraction.IFMP;
import appeng.util.LookDirection;
import appeng.util.Platform;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
public class PartPlacement
{
private ThreadLocal<Object> placing = new ThreadLocal<Object>();
private boolean wasCanceled = false;
@SubscribeEvent
public void playerInteract(TickEvent.ClientTickEvent event)
{
wasCanceled = false;
}
@SubscribeEvent
public void playerInteract(PlayerInteractEvent event)
@ -60,7 +68,7 @@ public class PartPlacement
{
World w = event.entity.worldObj;
TileEntity te = w.getTileEntity( mop.blockX, mop.blockY, mop.blockZ );
if ( te instanceof IPartHost )
if ( te instanceof IPartHost && wasCanceled )
event.setCanceled( true );
}
else if ( event.entityPlayer != null )
@ -90,7 +98,10 @@ public class PartPlacement
ItemStack held = event.entityPlayer.getHeldItem();
if ( place( held, event.x, event.y, event.z, event.face, event.entityPlayer, event.entityPlayer.worldObj, PlaceType.INTERACT_FIRST_PASS, 0 ) )
{
event.setCanceled( true );
wasCanceled = true;
}
placing.set( null );
}