diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-03-15 02:46:18 +0100 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-03-15 02:46:18 +0100 |
| commit | 8316ae330ec06b19caf678b9d499afd198fe5a06 (patch) | |
| tree | 9e120574de49e90f970910ffe743e8169d762ceb /src/WorldStorage/WSSAnvil.cpp | |
| parent | Add item frame saving. (diff) | |
| parent | Ignoring all config and SQLite files in the output folder. (diff) | |
| download | cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar.gz cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar.bz2 cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar.lz cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar.xz cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar.zst cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.zip | |
Diffstat (limited to 'src/WorldStorage/WSSAnvil.cpp')
| -rw-r--r-- | src/WorldStorage/WSSAnvil.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp index 6ac26c348..4f465e479 100644 --- a/src/WorldStorage/WSSAnvil.cpp +++ b/src/WorldStorage/WSSAnvil.cpp @@ -510,10 +510,10 @@ cChunkDef::BiomeMap * cWSSAnvil::LoadBiomeMapFromNBT(cChunkDef::BiomeMap * a_Bio // The biomes stored don't match in size return NULL; } - const int * BiomeData = (const int *)(a_NBT.GetData(a_TagIdx)); + const char * BiomeData = (a_NBT.GetData(a_TagIdx)); for (size_t i = 0; i < ARRAYCOUNT(*a_BiomeMap); i++) { - (*a_BiomeMap)[i] = (EMCSBiome)(ntohl(BiomeData[i])); + (*a_BiomeMap)[i] = (EMCSBiome)(GetBEInt(&BiomeData[i * 4])); if ((*a_BiomeMap)[i] == 0xff) { // Unassigned biomes @@ -667,6 +667,12 @@ bool cWSSAnvil::LoadItemFromNBT(cItem & a_Item, const cParsedNBT & a_NBT, int a_ { EnchantmentSerializer::ParseFromNBT(a_Item.m_Enchantments, a_NBT, EnchTag); } + + int FireworksTag = a_NBT.FindChildByName(TagTag, ((a_Item.m_ItemType == E_ITEM_FIREWORK_STAR) ? "Fireworks" : "Explosion")); + if (EnchTag > 0) + { + cFireworkItem::ParseFromNBT(a_Item.m_FireworkItem, a_NBT, FireworksTag, (ENUM_ITEM_ID)a_Item.m_ItemType); + } return true; } |