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

Merge branch 'master' into EntityCustomName

Browse Source 
Conflicts:
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/World.cpp
	src/World.h
This commit is contained in:
Howaner
2014-09-23 14:39:49 +02:00
parent 42dcd534df de163f0134
commit 4b38e077cf
232 changed files with 10895 additions and 4787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Entities/ItemFrame.cpp
View File

@@ -28,7 +28,7 @@ void cItemFrame::OnRightClicked(cPlayer & a_Player)
{
// Item not empty, rotate, clipping values to zero to three inclusive
m_Rotation++;
if (m_Rotation >= 4)
if (m_Rotation >= 8)
{
m_Rotation = 0;
}