OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 21:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

added a chunk sanity check

Browse Source 
removed unneccesary include
This commit is contained in:
Kamil 2020-11-08 10:08:22 +01:00 committed by Gent
parent d102fabc2f
commit f733aa60f0
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/NPCManager.cpp
View File

@ -917,6 +917,11 @@ void NPCManager::eggPickup(CNSocket* sock, CNPacketData* data) {
return; return;
} }
if (egg->chunkPos != ChunkManager::grabChunk(plr->x, plr->y, plr->instanceID)) {
std::cout << "[WARN] Player tried to open an egg from the other chunk?!" << std::endl;
return;
}
int typeId = egg->appearanceData.iNPCType; int typeId = egg->appearanceData.iNPCType;
if (EggTypes.find(typeId) == EggTypes.end()) { if (EggTypes.find(typeId) == EggTypes.end()) {
if (egg->npcClass != NPCClass::NPC_EGG) { if (egg->npcClass != NPCClass::NPC_EGG) {

1
src/Player.hpp
View File

@ -2,7 +2,6 @@
#include <string> #include <string>
#include <cstring> #include <cstring>
#include <unordered_map>
#include "CNProtocol.hpp" #include "CNProtocol.hpp"
#include "CNStructs.hpp" #include "CNStructs.hpp"

1
src/TableData.cpp
View File

@ -625,7 +625,6 @@ void TableData::loadGruntwork(int32_t *nextId) {
NPCManager::Eggs[id] = addEgg; NPCManager::Eggs[id] = addEgg;
NPCManager::updateNPCPosition(id, egg["iX"], egg["iY"], egg["iZ"], egg["iMapNum"]); NPCManager::updateNPCPosition(id, egg["iX"], egg["iY"], egg["iZ"], egg["iMapNum"]);
TableData::RunningEggs[id] = addEgg; TableData::RunningEggs[id] = addEgg;
std::cout << id << " " << addEgg->currentChunks.size() << std::endl;
} }