mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-13 19:50:31 +00:00
Code Issues Releases Wiki Activity

Merge pull request #476 from SquidDev-CC/ComputerCraft/hotfix/printer-clear

Browse Source 
Fix the printer overwriting the current page
This commit is contained in:
SquidDev 2017-11-14 21:14:10 +00:00
commit c8673473ef
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java
View File

@ -493,21 +493,6 @@ public class TilePrinter extends TilePeripheralBase
ItemStack paperStack = m_inventory.get( i ); ItemStack paperStack = m_inventory.get( i );
if( !paperStack.isEmpty() && isPaper(paperStack) ) if( !paperStack.isEmpty() && isPaper(paperStack) )
{ {
// Decrement ink
inkStack.shrink( 1 );
if( inkStack.isEmpty() )
{
m_inventory.set( 0, ItemStack.EMPTY );
}
// Decrement paper
paperStack.shrink( 1 );
if( paperStack.isEmpty() )
{
m_inventory.set( i, ItemStack.EMPTY );
updateAnim();
}
// Setup the new page // Setup the new page
int colour = inkStack.getItemDamage(); int colour = inkStack.getItemDamage();
if( colour >= 0 && colour < 16 ) { if( colour >= 0 && colour < 16 ) {
@ -532,6 +517,21 @@ public class TilePrinter extends TilePeripheralBase
m_pageTitle = ""; m_pageTitle = "";
} }
m_page.setCursorPos( 0, 0 ); m_page.setCursorPos( 0, 0 );
// Decrement ink
inkStack.shrink( 1 );
if( inkStack.isEmpty() )
{
m_inventory.set( 0, ItemStack.EMPTY );
}
// Decrement paper
paperStack.shrink( 1 );
if( paperStack.isEmpty() )
{
m_inventory.set( i, ItemStack.EMPTY );
updateAnim();
}
markDirty(); markDirty();
m_printing = true; m_printing = true;