forked from oerkki/voxelands
oops, diggin something should result in it being dug
This commit is contained in:
darkrose
parent
e70889b3a1
commit
5039e6b68c
213
src/server.cpp
213
src/server.cpp
|
|
@ -3045,118 +3045,131 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
|
|||
item = getDiggedMineralItem(mineral);
|
||||
|
||||
// If not mineral
|
||||
if (item == NULL && wield && (wield->getContent()&CONTENT_TOOLITEM_MASK) == CONTENT_TOOLITEM_MASK) {
|
||||
ToolItem *tool = (ToolItem*)wield;
|
||||
if (material == CONTENT_LEAVES && tool->getContent() == CONTENT_TOOLITEM_STEELSHEARS) {
|
||||
std::string dug_s = std::string("MaterialItem2 ")+itos(CONTENT_TRIMMED_LEAVES)+" 1";;
|
||||
std::istringstream is(dug_s, std::ios::binary);
|
||||
item = InventoryItem::deSerialize(is);
|
||||
}else if (material == CONTENT_JUNGLELEAVES && tool->getContent() == CONTENT_TOOLITEM_STEELSHEARS) {
|
||||
std::string dug_s = std::string("MaterialItem2 ")+itos(CONTENT_TRIMMED_JUNGLE_LEAVES)+" 1";;
|
||||
std::istringstream is(dug_s, std::ios::binary);
|
||||
item = InventoryItem::deSerialize(is);
|
||||
}else if (material == CONTENT_APPLE_LEAVES && tool->getContent() == CONTENT_TOOLITEM_STEELSHEARS) {
|
||||
std::string dug_s = std::string("MaterialItem2 ")+itos(CONTENT_TRIMMED_APPLE_LEAVES)+" 1";;
|
||||
std::istringstream is(dug_s, std::ios::binary);
|
||||
item = InventoryItem::deSerialize(is);
|
||||
}else if (material == CONTENT_CONIFER_LEAVES && tool->getContent() == CONTENT_TOOLITEM_STEELSHEARS) {
|
||||
std::string dug_s = std::string("MaterialItem2 ")+itos(CONTENT_TRIMMED_CONIFER_LEAVES)+" 1";;
|
||||
std::istringstream is(dug_s, std::ios::binary);
|
||||
item = InventoryItem::deSerialize(is);
|
||||
}else if (
|
||||
material == CONTENT_WATERSOURCE
|
||||
&& (
|
||||
tool->getContent() == CONTENT_TOOLITEM_WBUCKET
|
||||
|| tool->getContent() == CONTENT_TOOLITEM_STEELBUCKET
|
||||
|| tool->getContent() == CONTENT_TOOLITEM_TINBUCKET
|
||||
)
|
||||
) {
|
||||
std::string dug_s = std::string("ToolItem ") + tool->getToolName() + "_water 1";
|
||||
std::istringstream is(dug_s, std::ios::binary);
|
||||
item = InventoryItem::deSerialize(is);
|
||||
mlist->changeItem(item_i,item);
|
||||
item = NULL;
|
||||
UpdateCrafting(player->peer_id);
|
||||
SendInventory(player->peer_id);
|
||||
}else if (
|
||||
material == CONTENT_SPONGE_FULL
|
||||
&& (
|
||||
tool->getContent() == CONTENT_TOOLITEM_WBUCKET
|
||||
|| tool->getContent() == CONTENT_TOOLITEM_STEELBUCKET
|
||||
|| tool->getContent() == CONTENT_TOOLITEM_TINBUCKET
|
||||
)
|
||||
) {
|
||||
MapNode n = m_env.getMap().getNodeNoEx(p_under);
|
||||
n.setContent(CONTENT_SPONGE);
|
||||
|
||||
core::list<u16> far_players;
|
||||
sendAddNode(p_under, n, 0, &far_players, 30);
|
||||
|
||||
/*
|
||||
Add node.
|
||||
|
||||
This takes some time so it is done after the quick stuff
|
||||
*/
|
||||
core::map<v3s16, MapBlock*> modified_blocks;
|
||||
{
|
||||
MapEditEventIgnorer ign(&m_ignore_map_edit_events);
|
||||
|
||||
std::string p_name = std::string(player->getName());
|
||||
m_env.getMap().addNodeAndUpdate(p_under, n, modified_blocks, p_name);
|
||||
}
|
||||
/*
|
||||
Set blocks not sent to far players
|
||||
*/
|
||||
for(core::list<u16>::Iterator
|
||||
i = far_players.begin();
|
||||
i != far_players.end(); i++)
|
||||
{
|
||||
u16 peer_id = *i;
|
||||
RemoteClient *client = getClient(peer_id);
|
||||
if(client==NULL)
|
||||
continue;
|
||||
client->SetBlocksNotSent(modified_blocks);
|
||||
}
|
||||
std::string dug_s = std::string("ToolItem ") + tool->getName() + "_water 1";
|
||||
std::istringstream is(dug_s, std::ios::binary);
|
||||
item = InventoryItem::deSerialize(is);
|
||||
mlist->changeItem(item_i,item);
|
||||
item = NULL;
|
||||
UpdateCrafting(player->peer_id);
|
||||
SendInventory(player->peer_id);
|
||||
return;
|
||||
}else if (
|
||||
material == CONTENT_LAVASOURCE
|
||||
&& (
|
||||
tool->getContent() == CONTENT_TOOLITEM_WBUCKET
|
||||
|| tool->getContent() == CONTENT_TOOLITEM_STEELBUCKET
|
||||
|| tool->getContent() == CONTENT_TOOLITEM_TINBUCKET
|
||||
)
|
||||
) {
|
||||
if (
|
||||
g_settings->getBool("enable_lavabuckets") == false
|
||||
|| tool->getContent() == CONTENT_TOOLITEM_WBUCKET
|
||||
|| tool->getContent() == CONTENT_TOOLITEM_TINBUCKET
|
||||
if (item == NULL) {
|
||||
if (wield && (wield->getContent()&CONTENT_TOOLITEM_MASK) == CONTENT_TOOLITEM_MASK) {
|
||||
ToolItem *tool = (ToolItem*)wield;
|
||||
if (material == CONTENT_LEAVES && tool->getContent() == CONTENT_TOOLITEM_STEELSHEARS) {
|
||||
std::string dug_s = std::string("MaterialItem2 ")+itos(CONTENT_TRIMMED_LEAVES)+" 1";;
|
||||
std::istringstream is(dug_s, std::ios::binary);
|
||||
item = InventoryItem::deSerialize(is);
|
||||
}else if (material == CONTENT_JUNGLELEAVES && tool->getContent() == CONTENT_TOOLITEM_STEELSHEARS) {
|
||||
std::string dug_s = std::string("MaterialItem2 ")+itos(CONTENT_TRIMMED_JUNGLE_LEAVES)+" 1";;
|
||||
std::istringstream is(dug_s, std::ios::binary);
|
||||
item = InventoryItem::deSerialize(is);
|
||||
}else if (material == CONTENT_APPLE_LEAVES && tool->getContent() == CONTENT_TOOLITEM_STEELSHEARS) {
|
||||
std::string dug_s = std::string("MaterialItem2 ")+itos(CONTENT_TRIMMED_APPLE_LEAVES)+" 1";;
|
||||
std::istringstream is(dug_s, std::ios::binary);
|
||||
item = InventoryItem::deSerialize(is);
|
||||
}else if (material == CONTENT_CONIFER_LEAVES && tool->getContent() == CONTENT_TOOLITEM_STEELSHEARS) {
|
||||
std::string dug_s = std::string("MaterialItem2 ")+itos(CONTENT_TRIMMED_CONIFER_LEAVES)+" 1";;
|
||||
std::istringstream is(dug_s, std::ios::binary);
|
||||
item = InventoryItem::deSerialize(is);
|
||||
}else if (
|
||||
material == CONTENT_WATERSOURCE
|
||||
&& (
|
||||
tool->getContent() == CONTENT_TOOLITEM_WBUCKET
|
||||
|| tool->getContent() == CONTENT_TOOLITEM_STEELBUCKET
|
||||
|| tool->getContent() == CONTENT_TOOLITEM_TINBUCKET
|
||||
)
|
||||
) {
|
||||
mlist->deleteItem(item_i);
|
||||
HandlePlayerHP(player,4);
|
||||
}else{
|
||||
std::string dug_s = std::string("ToolItem ") + tool->getToolName() + "_lava 1";
|
||||
std::string dug_s = std::string("ToolItem ") + tool->getToolName() + "_water 1";
|
||||
std::istringstream is(dug_s, std::ios::binary);
|
||||
item = InventoryItem::deSerialize(is);
|
||||
mlist->changeItem(item_i,item);
|
||||
item = NULL;
|
||||
UpdateCrafting(player->peer_id);
|
||||
SendInventory(player->peer_id);
|
||||
}else if (
|
||||
material == CONTENT_SPONGE_FULL
|
||||
&& (
|
||||
tool->getContent() == CONTENT_TOOLITEM_WBUCKET
|
||||
|| tool->getContent() == CONTENT_TOOLITEM_STEELBUCKET
|
||||
|| tool->getContent() == CONTENT_TOOLITEM_TINBUCKET
|
||||
)
|
||||
) {
|
||||
MapNode n = m_env.getMap().getNodeNoEx(p_under);
|
||||
n.setContent(CONTENT_SPONGE);
|
||||
|
||||
core::list<u16> far_players;
|
||||
sendAddNode(p_under, n, 0, &far_players, 30);
|
||||
|
||||
/*
|
||||
Add node.
|
||||
|
||||
This takes some time so it is done after the quick stuff
|
||||
*/
|
||||
core::map<v3s16, MapBlock*> modified_blocks;
|
||||
{
|
||||
MapEditEventIgnorer ign(&m_ignore_map_edit_events);
|
||||
|
||||
std::string p_name = std::string(player->getName());
|
||||
m_env.getMap().addNodeAndUpdate(p_under, n, modified_blocks, p_name);
|
||||
}
|
||||
/*
|
||||
Set blocks not sent to far players
|
||||
*/
|
||||
for(core::list<u16>::Iterator
|
||||
i = far_players.begin();
|
||||
i != far_players.end(); i++)
|
||||
{
|
||||
u16 peer_id = *i;
|
||||
RemoteClient *client = getClient(peer_id);
|
||||
if(client==NULL)
|
||||
continue;
|
||||
client->SetBlocksNotSent(modified_blocks);
|
||||
}
|
||||
std::string dug_s = std::string("ToolItem ") + tool->getName() + "_water 1";
|
||||
std::istringstream is(dug_s, std::ios::binary);
|
||||
item = InventoryItem::deSerialize(is);
|
||||
mlist->changeItem(item_i,item);
|
||||
item = NULL;
|
||||
UpdateCrafting(player->peer_id);
|
||||
SendInventory(player->peer_id);
|
||||
return;
|
||||
}else if (
|
||||
material == CONTENT_LAVASOURCE
|
||||
&& (
|
||||
tool->getContent() == CONTENT_TOOLITEM_WBUCKET
|
||||
|| tool->getContent() == CONTENT_TOOLITEM_STEELBUCKET
|
||||
|| tool->getContent() == CONTENT_TOOLITEM_TINBUCKET
|
||||
)
|
||||
) {
|
||||
if (
|
||||
g_settings->getBool("enable_lavabuckets") == false
|
||||
|| tool->getContent() == CONTENT_TOOLITEM_WBUCKET
|
||||
|| tool->getContent() == CONTENT_TOOLITEM_TINBUCKET
|
||||
) {
|
||||
mlist->deleteItem(item_i);
|
||||
HandlePlayerHP(player,4);
|
||||
}else{
|
||||
std::string dug_s = std::string("ToolItem ") + tool->getToolName() + "_lava 1";
|
||||
std::istringstream is(dug_s, std::ios::binary);
|
||||
item = InventoryItem::deSerialize(is);
|
||||
mlist->changeItem(item_i,item);
|
||||
item = NULL;
|
||||
}
|
||||
UpdateCrafting(player->peer_id);
|
||||
SendInventory(player->peer_id);
|
||||
}else if (material != CONTENT_WATERSOURCE && material != CONTENT_LAVASOURCE) {
|
||||
std::string &dug_s = content_features(material).dug_item;
|
||||
if (dug_s != "") {
|
||||
std::istringstream is(dug_s, std::ios::binary);
|
||||
item = InventoryItem::deSerialize(is);
|
||||
}
|
||||
}
|
||||
UpdateCrafting(player->peer_id);
|
||||
SendInventory(player->peer_id);
|
||||
}else if (material != CONTENT_WATERSOURCE && material != CONTENT_LAVASOURCE) {
|
||||
std::string &dug_s = content_features(material).dug_item;
|
||||
if(dug_s != "")
|
||||
{
|
||||
if (dug_s != "") {
|
||||
std::istringstream is(dug_s, std::ios::binary);
|
||||
item = InventoryItem::deSerialize(is);
|
||||
}
|
||||
}
|
||||
}else if (material != CONTENT_WATERSOURCE && material != CONTENT_LAVASOURCE) {
|
||||
std::string &dug_s = content_features(material).dug_item;
|
||||
if (dug_s != "") {
|
||||
std::istringstream is(dug_s, std::ios::binary);
|
||||
item = InventoryItem::deSerialize(is);
|
||||
}
|
||||
}
|
||||
|
||||
/* more attempts to stop water/lava being dug */
|
||||
|
|
|
|||
Loading…
Reference in New Issue