flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/master' into c++11

Browse Source 
Conflicts:
	src/OSSupport/Thread.cpp
This commit is contained in:
Tiger Wang
2014-12-06 17:41:48 +00:00
parent ed99216ba4 3f23813412
commit 3acdf25b05
37 changed files with 695 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/UI/SlotArea.cpp
View File

@@ -1167,7 +1167,7 @@ void cSlotAreaAnvil::UpdateResult(cPlayer & a_Player)
{
m_MaximumCost = 39;
}
if (m_MaximumCost >= 40 && !a_Player.IsGameModeCreative())
if ((m_MaximumCost >= 40) && !a_Player.IsGameModeCreative())
{
Input.Empty();
}