Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
SEnv: Remove static_exists from ActiveObjects in deleted blocks
  • Loading branch information
kwolekr committed Aug 16, 2015
1 parent 5556ba1 commit bcf38a2
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 3 deletions.
28 changes: 27 additions & 1 deletion src/environment.cpp
Expand Up @@ -1424,6 +1424,33 @@ void ServerEnvironment::getRemovedActiveObjects(v3s16 pos, s16 radius,
}
}

void ServerEnvironment::setStaticForActiveObjectsInBlock(
v3s16 blockpos, bool static_exists, v3s16 static_block)
{
MapBlock *block = m_map->getBlockNoCreateNoEx(blockpos);
if (!block)
return;

for (std::map<u16, StaticObject>::iterator
so_it = block->m_static_objects.m_active.begin();
so_it != block->m_static_objects.m_active.end(); ++so_it) {
// Get the ServerActiveObject counterpart to this StaticObject
std::map<u16, ServerActiveObject *>::iterator ao_it;
ao_it = m_active_objects.find(so_it->first);
if (ao_it == m_active_objects.end()) {
// If this ever happens, there must be some kind of nasty bug.
errorstream << "ServerEnvironment::setStaticForObjectsInBlock(): "
"Object from MapBlock::m_static_objects::m_active not found "
"in m_active_objects";
continue;
}

ServerActiveObject *sao = ao_it->second;
sao->m_static_exists = static_exists;
sao->m_static_block = static_block;
}
}

ActiveObjectMessage ServerEnvironment::getActiveObjectMessage()
{
if(m_active_object_messages.empty())
Expand Down Expand Up @@ -1960,7 +1987,6 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
}
}


#ifndef SERVER

#include "clientsimpleobject.h"
Expand Down
5 changes: 5 additions & 0 deletions src/environment.h
Expand Up @@ -327,6 +327,11 @@ class ServerEnvironment : public Environment

std::set<v3s16>* getForceloadedBlocks() { return &m_active_blocks.m_forceloaded_list; };

// Sets the static object status all the active objects in the specified block
// This is only really needed for deleting blocks from the map
void setStaticForActiveObjectsInBlock(v3s16 blockpos,
bool static_exists, v3s16 static_block=v3s16(0,0,0));

private:

/*
Expand Down
6 changes: 4 additions & 2 deletions src/script/lua_api/l_env.cpp
Expand Up @@ -773,10 +773,12 @@ int ModApiEnvMod::l_delete_area(lua_State *L)
for (s16 y = bpmin.Y; y <= bpmax.Y; y++)
for (s16 x = bpmin.X; x <= bpmax.X; x++) {
v3s16 bp(x, y, z);
if (map.deleteBlock(bp))
if (map.deleteBlock(bp)) {
env->setStaticForActiveObjectsInBlock(bp, false);
event.modified_blocks.insert(bp);
else
} else {
success = false;
}
}

map.dispatchEvent(&event);
Expand Down

0 comments on commit bcf38a2

Please sign in to comment.