mirror of
https://github.com/OpenFusionProject/OpenFusion.git
synced 2024-11-22 13:30:06 +00:00
Merge pull request #114 from gsemaj/bugfix1
Prevent player position from updating when flying on monkey
This commit is contained in:
commit
e5a24bcb70
@ -183,11 +183,15 @@ void PlayerManager::updatePlayerPosition(CNSocket* sock, int X, int Y, int Z) {
|
|||||||
view.plr->x = X;
|
view.plr->x = X;
|
||||||
view.plr->y = Y;
|
view.plr->y = Y;
|
||||||
view.plr->z = Z;
|
view.plr->z = Z;
|
||||||
|
updatePlayerChunk(sock, X, Y);
|
||||||
|
}
|
||||||
|
|
||||||
|
void PlayerManager::updatePlayerChunk(CNSocket* sock, int X, int Y) {
|
||||||
|
PlayerView& view = players[sock];
|
||||||
std::pair<int, int> newPos = ChunkManager::grabChunk(X, Y);
|
std::pair<int, int> newPos = ChunkManager::grabChunk(X, Y);
|
||||||
|
|
||||||
// nothing to be done
|
// nothing to be done
|
||||||
if (newPos == view.chunkPos)
|
if (newPos == view.chunkPos)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// add player to chunk
|
// add player to chunk
|
||||||
@ -195,10 +199,10 @@ void PlayerManager::updatePlayerPosition(CNSocket* sock, int X, int Y, int Z) {
|
|||||||
|
|
||||||
// first, remove all the old npcs & players from the old chunks
|
// first, remove all the old npcs & players from the old chunks
|
||||||
removePlayerFromChunks(ChunkManager::getDeltaChunks(view.currentChunks, allChunks), sock);
|
removePlayerFromChunks(ChunkManager::getDeltaChunks(view.currentChunks, allChunks), sock);
|
||||||
|
|
||||||
// now, add all the new npcs & players!
|
// now, add all the new npcs & players!
|
||||||
addPlayerToChunks(ChunkManager::getDeltaChunks(allChunks, view.currentChunks), sock);
|
addPlayerToChunks(ChunkManager::getDeltaChunks(allChunks, view.currentChunks), sock);
|
||||||
|
|
||||||
ChunkManager::addPlayer(X, Y, sock); // takes care of adding the player to the chunk if it exists or not
|
ChunkManager::addPlayer(X, Y, sock); // takes care of adding the player to the chunk if it exists or not
|
||||||
view.chunkPos = newPos;
|
view.chunkPos = newPos;
|
||||||
view.currentChunks = allChunks;
|
view.currentChunks = allChunks;
|
||||||
|
@ -32,6 +32,7 @@ namespace PlayerManager {
|
|||||||
|
|
||||||
void updatePlayerPosition(CNSocket* sock, int X, int Y, int Z);
|
void updatePlayerPosition(CNSocket* sock, int X, int Y, int Z);
|
||||||
void updatePlayerPosition(CNSocket* sock, int X, int Y, int Z, int angle);
|
void updatePlayerPosition(CNSocket* sock, int X, int Y, int Z, int angle);
|
||||||
|
void updatePlayerChunk(CNSocket* sock, int X, int Y);
|
||||||
|
|
||||||
void sendToViewable(CNSocket* sock, void* buf, uint32_t type, size_t size);
|
void sendToViewable(CNSocket* sock, void* buf, uint32_t type, size_t size);
|
||||||
|
|
||||||
|
@ -238,7 +238,7 @@ void TransportManager::stepSkywaySystem() {
|
|||||||
bmstk.iToZ = point.z;
|
bmstk.iToZ = point.z;
|
||||||
it->first->sendPacket((void*)&bmstk, P_FE2CL_PC_BROOMSTICK_MOVE, sizeof(sP_FE2CL_PC_BROOMSTICK_MOVE));
|
it->first->sendPacket((void*)&bmstk, P_FE2CL_PC_BROOMSTICK_MOVE, sizeof(sP_FE2CL_PC_BROOMSTICK_MOVE));
|
||||||
// set player location to point to update viewables
|
// set player location to point to update viewables
|
||||||
PlayerManager::updatePlayerPosition(it->first, point.x, point.y, point.z);
|
PlayerManager::updatePlayerChunk(it->first, point.x, point.y);
|
||||||
// send packet to players in view
|
// send packet to players in view
|
||||||
PlayerManager::sendToViewable(it->first, (void*)&bmstk, P_FE2CL_PC_BROOMSTICK_MOVE, sizeof(sP_FE2CL_PC_BROOMSTICK_MOVE));
|
PlayerManager::sendToViewable(it->first, (void*)&bmstk, P_FE2CL_PC_BROOMSTICK_MOVE, sizeof(sP_FE2CL_PC_BROOMSTICK_MOVE));
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user