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

Fix more items and unsafe checks that made items get deleted.

Browse Source
This commit is contained in:
Gunther De Wachter
2017-07-02 07:44:21 +02:00
parent b67d7eed82
commit e96339dd2b
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/tools/ToolMemoryCard.java
+2 -2
View File
@@ -144,9 +144,9 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard
{
if( player.isSneaking() && !w.isRemote )
{
final IMemoryCard mem = (IMemoryCard) player.getHeldItemMainhand().getItem();
final IMemoryCard mem = (IMemoryCard) player.getHeldItem(hand).getItem();
mem.notifyUser( player, MemoryCardMessages.SETTINGS_CLEARED );
player.getHeldItemMainhand().setTagCompound( null );
player.getHeldItem(hand).setTagCompound( null );
return EnumActionResult.SUCCESS;
}
else
src/main/java/appeng/items/tools/powered/ToolPortableCell.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell,
public ActionResult<ItemStack> onItemRightClick( final World w, final EntityPlayer player, final EnumHand hand )
{
Platform.openGUI( player, null, AEPartLocation.INTERNAL, GuiBridge.GUI_PORTABLE_CELL );
return new ActionResult<ItemStack>( EnumActionResult.SUCCESS, player.getHeldItemMainhand() );
return new ActionResult<ItemStack>( EnumActionResult.SUCCESS, player.getHeldItem(hand) );
}
@SideOnly( Side.CLIENT )
src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java
+2 -2
View File
@@ -58,8 +58,8 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless
@Override
public ActionResult<ItemStack> onItemRightClick( final World w, final EntityPlayer player, final EnumHand hand )
{
AEApi.instance().registries().wireless().openWirelessTerminalGui( player.getHeldItemMainhand(), w, player );
return new ActionResult<ItemStack>( EnumActionResult.SUCCESS, player.getHeldItemMainhand() );
AEApi.instance().registries().wireless().openWirelessTerminalGui( player.getHeldItem(hand), w, player );
return new ActionResult<ItemStack>( EnumActionResult.SUCCESS, player.getHeldItem(hand) );
}
@SideOnly( Side.CLIENT )