OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-12-19 19:10:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the pointer to the deallocated chunk from the current player/NPC.

Browse Source 
This fixes the Great Crash Bug(tm).
This commit is contained in:
dongresource
2020-10-15 04:36:38 +02:00
parent 5784e77654
commit 5a80c53e79
6 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/NPCManager.cpp
View File

@@ -126,7 +126,7 @@ void NPCManager::destroyNPC(int32_t id) {
// remove from mob manager
if (MobManager::Mobs.find(id) != MobManager::Mobs.end())
MobManager::Mobs.erase(id);
MobManager::Mobs.erase(id);
// finally, remove it from the map and free it
NPCs.erase(id);
@@ -162,8 +162,15 @@ void NPCManager::updateNPCPosition(int32_t id, int X, int Y, int Z) {
// send npc enter to new chunks
addNPC(ChunkManager::getDeltaChunks(allChunks, npc->currentChunks), id);
// update chunks
ChunkManager::removeNPC(npc->chunkPos, id);
Chunk *chunk = nullptr;
if (ChunkManager::checkChunk(npc->chunkPos))
chunk = ChunkManager::chunks[npc->chunkPos];
if (ChunkManager::removeNPC(npc->chunkPos, id)) {
// if the old chunk was deallocated, remove it
allChunks.erase(std::remove(allChunks.begin(), allChunks.end(), chunk), allChunks.end());
}
ChunkManager::addNPC(X, Y, npc->instanceID, id);
npc->chunkPos = newPos;