diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-03-23 22:12:48 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-03-23 22:12:48 +0100 |
| commit | be31652c40af10b0410c76c6bd37b60717c385be (patch) | |
| tree | a84e138bc4d0c1cd4b298dc807f3a196e9a78e3d /source/WSSAnvil.cpp | |
| parent | Fixed a deadlock by removing clients from all chunks upon their exit, not using the clients chunklists. (diff) | |
| download | cuberite-be31652c40af10b0410c76c6bd37b60717c385be.tar cuberite-be31652c40af10b0410c76c6bd37b60717c385be.tar.gz cuberite-be31652c40af10b0410c76c6bd37b60717c385be.tar.bz2 cuberite-be31652c40af10b0410c76c6bd37b60717c385be.tar.lz cuberite-be31652c40af10b0410c76c6bd37b60717c385be.tar.xz cuberite-be31652c40af10b0410c76c6bd37b60717c385be.tar.zst cuberite-be31652c40af10b0410c76c6bd37b60717c385be.zip | |
Diffstat (limited to 'source/WSSAnvil.cpp')
| -rw-r--r-- | source/WSSAnvil.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/WSSAnvil.cpp b/source/WSSAnvil.cpp index 6520a7c95..cf0010362 100644 --- a/source/WSSAnvil.cpp +++ b/source/WSSAnvil.cpp @@ -111,7 +111,7 @@ cWSSAnvil::cMCAFile * cWSSAnvil::LoadMCAFile(const cChunkCoords & a_Chunk) // Load it anew:
AString FileName;
- Printf(FileName, "%s/r.%d.%d.mca", m_World->GetName().c_str(), RegionX, RegionZ);
+ Printf(FileName, "%s/r.%d.%d.mca", m_WSI->WSIGetFolder().c_str(), RegionX, RegionZ);
cMCAFile * f = new cMCAFile(FileName, RegionX, RegionZ);
if (f == NULL)
{
@@ -282,7 +282,7 @@ bool cWSSAnvil::LoadChunkFromNBT(const cChunkCoords & a_Chunk, cNBTTag & a_NBT) memset(ChunkData + cChunkDef::SkyLightOffset, 0xff, cChunkDef::NumBlocks / 2);
//*/
- m_World->ChunkDataLoaded(
+ m_WSI->WSIChunkDataLoaded(
a_Chunk.m_ChunkX, a_Chunk.m_ChunkY, a_Chunk.m_ChunkZ,
ChunkData,
ChunkData + cChunkDef::MetaOffset,
@@ -353,7 +353,7 @@ void cWSSAnvil::LoadChestFromNBT(cBlockEntityList & a_BlockEntities, const cNBTC {
return; // Make it an empty chest
}
- std::auto_ptr<cChestEntity> Chest(new cChestEntity(x, y, z, m_World));
+ std::auto_ptr<cChestEntity> Chest(new cChestEntity(x, y, z));
const cNBTTags & ItemDefs = Items->GetChildren();
for (cNBTTags::const_iterator itr = ItemDefs.begin(); itr != ItemDefs.end(); ++itr)
{
|