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

Possible fix for chunking desyncs + CHUNKPOS macro

Browse Source
This commit is contained in:
Gent S
2020-11-14 18:36:04 -05:00
parent cc74b01f72
commit b22ba781c8
7 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/PlayerManager.cpp
View File

@@ -175,6 +175,9 @@ void PlayerManager::addPlayerToChunks(std::vector<Chunk*> chunks, CNSocket* sock
// add players
for (CNSocket* otherSock : chunk->players) {
if (sock == otherSock)
continue;
Player *otherPlr = players[otherSock].plr;
Player *plr = players[sock].plr;
@@ -226,13 +229,14 @@ void PlayerManager::updatePlayerPosition(CNSocket* sock, int X, int Y, int Z) {
void PlayerManager::updatePlayerChunk(CNSocket* sock, int X, int Y, uint64_t instanceID) {
PlayerView& view = players[sock];
std::tuple<int, int, uint64_t> newPos = ChunkManager::grabChunk(X, Y, view.plr->instanceID);
CHUNKPOS newPos = ChunkManager::grabChunk(X, Y, view.plr->instanceID);
// nothing to be done
if (newPos == view.chunkPos)
return;
// add player to chunk
ChunkManager::addPlayer(X, Y, view.plr->instanceID, sock);
std::vector<Chunk*> allChunks = ChunkManager::grabChunks(newPos);
Chunk *chunk = nullptr;
@@ -249,7 +253,6 @@ void PlayerManager::updatePlayerChunk(CNSocket* sock, int X, int Y, uint64_t ins
view.chunkPos = newPos;
view.currentChunks = allChunks;
ChunkManager::addPlayer(X, Y, view.plr->instanceID, sock); // takes care of adding the player to the chunk if it exists or not
}
void PlayerManager::sendPlayerTo(CNSocket* sock, int X, int Y, int Z, uint64_t I) {