aboutsummaryrefslogtreecommitdiff
path: root/src/map.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-09-26 11:57:28 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-09-26 11:57:28 +0300
commit0ccc0ac927bdbfcc97c1b5c9d5dc64754946f817 (patch)
tree0db7c756fbcfd18497dee04578d7cb037b2bd7fa /src/map.cpp
parent63eca0feb2a08aa15f8be1164c4815a44246a2e6 (diff)
parent8b875d71d1ab928e9866914b886ff58cf8a38192 (diff)
downloadhax-minetest-server-0ccc0ac927bdbfcc97c1b5c9d5dc64754946f817.tar.gz
hax-minetest-server-0ccc0ac927bdbfcc97c1b5c9d5dc64754946f817.zip
Merge remote-tracking branch 'darkrose/master'
Diffstat (limited to '')
-rw-r--r--src/map.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map.cpp b/src/map.cpp
index 7de79c75d..32675f08d 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -890,7 +890,7 @@ void Map::updateLighting(core::map<v3s16, MapBlock*> & a_blocks,
/*
*/
void Map::addNodeAndUpdate(v3s16 p, MapNode n,
- core::map<v3s16, MapBlock*> &modified_blocks)
+ core::map<v3s16, MapBlock*> &modified_blocks, std::string &player_name)
{
/*PrintInfo(m_dout);
m_dout<<DTIME<<"Map::addNodeAndUpdate(): p=("
@@ -1014,6 +1014,7 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
if(meta_proto)
{
NodeMetadata *meta = meta_proto->clone();
+ meta->setOwner(player_name);
setNodeMetadata(p, meta);
}
@@ -1290,7 +1291,8 @@ bool Map::addNodeWithEvent(v3s16 p, MapNode n)
bool succeeded = true;
try{
core::map<v3s16, MapBlock*> modified_blocks;
- addNodeAndUpdate(p, n, modified_blocks);
+ std::string st = std::string("");
+ addNodeAndUpdate(p, n, modified_blocks, st);
// Copy modified_blocks to event
for(core::map<v3s16, MapBlock*>::Iterator