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

Merge branch 'master' into ChunkLoader

Browse Source 
Conflicts:
	src/ClientHandle.cpp
This commit is contained in:
Howaner
2014-10-21 16:55:22 +02:00
parent 97623fc634 bc97399b01
commit 44514e53fc
130 changed files with 1953 additions and 2315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Protocol/Protocol17x.cpp
View File

@@ -1439,7 +1439,7 @@ void cProtocol172::SendWindowOpen(const cWindow & a_Window)
void cProtocol172::SendWindowProperty(const cWindow & a_Window, int a_Property, int a_Value)
void cProtocol172::SendWindowProperty(const cWindow & a_Window, short a_Property, short a_Value)
{
ASSERT(m_State == 3); // In game mode?