Futuray-pgm
/
voxelands
forked from oerkki/voxelands
1
1
Fork 0
Code Pull Requests Activity

fix bug in searchNear*

This commit is contained in:
darkrose 2014-09-27 06:31:48 +10:00
parent 703f0a8ccf
commit 8bb869958c
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/environment.cpp
View File

@ -748,12 +748,10 @@ bool ServerEnvironment::searchNear(v3s16 pos, v3s16 radius_min, v3s16 radius_max
p = pos+v3s16(x,y,z); p = pos+v3s16(x,y,z);
MapNode n_test; MapNode n_test;
bp = getNodeBlockPos(p); bp = getNodeBlockPos(p);
if (p == blockpos) { if (bp == blockpos) {
n_test = block->getNodeNoCheck(p-relpos); n_test = block->getNodeNoCheck(p-relpos);
}else{ }else{
MapBlock *b = m_map->getBlockNoCreateNoEx(bp); n_test = m_map->getNodeNoEx(p);
if (b)
n_test = b->getNodeNoEx(p-(bp*MAP_BLOCKSIZE));
} }
for (std::vector<content_t>::iterator i=c.begin(); i != c.end(); i++) { for (std::vector<content_t>::iterator i=c.begin(); i != c.end(); i++) {
if (n_test.getContent() == *i) { if (n_test.getContent() == *i) {
@ -785,12 +783,10 @@ bool ServerEnvironment::searchNearInv(v3s16 pos, v3s16 radius_min, v3s16 radius_
p = pos+v3s16(x,y,z); p = pos+v3s16(x,y,z);
MapNode n_test; MapNode n_test;
bp = getNodeBlockPos(p); bp = getNodeBlockPos(p);
if (p == blockpos) { if (bp == blockpos) {
n_test = block->getNodeNoCheck(p-relpos); n_test = block->getNodeNoCheck(p-relpos);
}else{ }else{
MapBlock *b = m_map->getBlockNoCreateNoEx(bp); n_test = m_map->getNodeNoEx(p);
if (b)
n_test = b->getNodeNoEx(p-(bp*MAP_BLOCKSIZE));
} }
bool s = false; bool s = false;
for (std::vector<content_t>::iterator i=c.begin(); i != c.end(); i++) { for (std::vector<content_t>::iterator i=c.begin(); i != c.end(); i++) {