jachoo
/
minetest-jachoo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix and message for building on edge of clan territory

master
placki 2011-10-27 23:10:43 +02:00
parent 0d367550bc
commit ba858f17a0
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/game.cpp
View File

@ -1759,8 +1759,12 @@ void the_game(
u16 block_owner = block ? block->getOwner() : 0;
u16 block2_owner = block2 ? block2->getOwner() : 0;
if(block_owner || block2_owner )
ownershiptext = L"Property of clan ";
if(block_owner || block2_owner ){
if(block_owner == block2_owner)
ownershiptext = L"Property of clan ";
else
ownershiptext = L"Border of clan ";
}
if(block_owner)
ownershiptext += narrow_to_wide(clansManager->clanNameNoEx(block_owner));
@ -1929,7 +1933,7 @@ void the_game(
}
}
if(canModify && input->getRightClicked())
if(canModifyNeighbour && input->getRightClicked())
{
infostream<<"Ground right-clicked"<<std::endl;

5
src/server.cpp
View File

@ -2409,8 +2409,9 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
p_over.Z = readS16(&data[13]);
u16 item_i = readU16(&data[15]);
//j
if( !player->canModify(&m_env.clansManager,&m_env.getMap(),NULL,NULL,&p_under) || !player->canModify(&m_env.clansManager,&m_env.getMap(),NULL,NULL,&p_over) )
//j,placki
if( ( action == 1 && !player->canModify(&m_env.clansManager,&m_env.getMap(),NULL,NULL,&p_over) )
||( action != 1 && !player->canModify(&m_env.clansManager,&m_env.getMap(),NULL,NULL,&p_under) ) )
{
derr_server<<"Player isn't owner of a block"<<std::endl;
RemoteClient *client = getClient(peer_id);