lisacvuk
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get neighbor from same map block if possible in ABMHandler (#4998)

master
lhofhansl 2017-01-07 23:42:25 -08:00 committed by Zeno-
parent 8f9611bcb2
commit b0746834cc
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/environment.cpp
View File

@ -902,14 +902,23 @@ public:
if(!i->required_neighbors.empty()) if(!i->required_neighbors.empty())
{ {
v3s16 p1; v3s16 p1;
for(p1.X = p.X-1; p1.X <= p.X+1; p1.X++) for(p1.X = p0.X-1; p1.X <= p0.X+1; p1.X++)
for(p1.Y = p.Y-1; p1.Y <= p.Y+1; p1.Y++) for(p1.Y = p0.Y-1; p1.Y <= p0.Y+1; p1.Y++)
for(p1.Z = p.Z-1; p1.Z <= p.Z+1; p1.Z++) for(p1.Z = p0.Z-1; p1.Z <= p0.Z+1; p1.Z++)
{ {
if(p1 == p) if(p1 == p0)
continue; continue;
MapNode n = map->getNodeNoEx(p1); content_t c;
content_t c = n.getContent(); if (block->isValidPosition(p1)) {
// if the neighbor is found on the same map block
// get it straight from there
const MapNode &n = block->getNodeUnsafe(p1);
c = n.getContent();
} else {
// otherwise consult the map
MapNode n = map->getNodeNoEx(p1 + block->getPosRelative());
c = n.getContent();
}
std::set<content_t>::const_iterator k; std::set<content_t>::const_iterator k;
k = i->required_neighbors.find(c); k = i->required_neighbors.find(c);
if(k != i->required_neighbors.end()){ if(k != i->required_neighbors.end()){