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

Merge branch 'master' into itemframes

Browse Source 
Conflicts:
	src/Entities/Entity.h
	src/WorldStorage/NBTChunkSerializer.cpp
This commit is contained in:
Tiger Wang
2014-02-18 22:13:44 +00:00
parent 08229956ff 98332c5b76
commit a686656253
30 changed files with 503 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/WorldStorage/NBTChunkSerializer.cpp
View File

@@ -628,6 +628,7 @@ void cNBTChunkSerializer::Entity(cEntity * a_Entity)
case cEntity::etTNT: /* TODO */ break;
case cEntity::etExpOrb: /* TODO */ break;
case cEntity::etItemFrame: /* TODO */ break;
case cEntity::etPainting: /* TODO */ break;
case cEntity::etPlayer: return; // Players aren't saved into the world
default:
{