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

cPainting saving implemented

Browse Source 
Additionally, it now inherits from cHangingEntity.
This commit is contained in:
Tiger Wang
2015-03-13 23:05:06 +00:00
parent e15e30a030
commit 3d398baf35
13 changed files with 83 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/WorldStorage/WSSAnvil.cpp
View File

@@ -50,6 +50,7 @@
#include "../Entities/ExpOrb.h"
#include "../Entities/HangingEntity.h"
#include "../Entities/ItemFrame.h"
#include "../Entities/Painting.h"
#include "../Protocol/MojangAPI.h"
#include "Server.h"
@@ -1337,6 +1338,10 @@ void cWSSAnvil::LoadEntityFromNBT(cEntityList & a_Entities, const cParsedNBT & a
{
LoadPickupFromNBT(a_Entities, a_NBT, a_EntityTagIdx);
}
else if (strncmp(a_IDTag, "Painting", a_IDTagLength) == 0)
{
LoadPaintingFromNBT(a_Entities, a_NBT, a_EntityTagIdx);
}
else if (strncmp(a_IDTag, "PrimedTnt", a_IDTagLength) == 0)
{
LoadTNTFromNBT(a_Entities, a_NBT, a_EntityTagIdx);
@@ -1808,6 +1813,29 @@ void cWSSAnvil::LoadItemFrameFromNBT(cEntityList & a_Entities, const cParsedNBT
void cWSSAnvil::LoadPaintingFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx)
{
// Load painting name:
int MotiveTag = a_NBT.FindChildByName(a_TagIdx, "Motive");
if ((MotiveTag < 0) || (a_NBT.GetType(MotiveTag) != TAG_String))
{
return;
}
std::unique_ptr<cPainting> Painting(new cPainting(a_NBT.GetString(MotiveTag), BLOCK_FACE_NONE, 0.0, 0.0, 0.0));
if (!LoadEntityBaseFromNBT(*Painting.get(), a_NBT, a_TagIdx))
{
return;
}
LoadHangingFromNBT(*Painting.get(), a_NBT, a_TagIdx);
a_Entities.push_back(Painting.release());
}
void cWSSAnvil::LoadArrowFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx)
{
std::unique_ptr<cArrowEntity> Arrow(new cArrowEntity(nullptr, 0, 0, 0, Vector3d(0, 0, 0)));