[2] Code cleanup in serverpackethandler (#9349)
* Code cleanup in serverpackethandler * do not define p_under unless a node is pointed * use switch-case and reduce indentationmaster
HybridDog
GitHub
parent
d3d218940b
commit
f5df70764d
|
|
@ -986,10 +986,6 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
|
|||
// Update wielded item
|
||||
playersao->getPlayer()->setWieldIndex(item_i);
|
||||
|
||||
// Get pointed to node (undefined if not POINTEDTYPE_NODE)
|
||||
v3s16 p_under = pointed.node_undersurface;
|
||||
v3s16 p_above = pointed.node_abovesurface;
|
||||
|
||||
// Get pointed to object (NULL if not POINTEDTYPE_OBJECT)
|
||||
ServerActiveObject *pointed_object = NULL;
|
||||
if (pointed.type == POINTEDTHING_OBJECT) {
|
||||
|
|
@ -1002,17 +998,6 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
|
|||
|
||||
}
|
||||
|
||||
v3f pointed_pos_under = player_pos;
|
||||
v3f pointed_pos_above = player_pos;
|
||||
if (pointed.type == POINTEDTHING_NODE) {
|
||||
pointed_pos_under = intToFloat(p_under, BS);
|
||||
pointed_pos_above = intToFloat(p_above, BS);
|
||||
}
|
||||
else if (pointed.type == POINTEDTHING_OBJECT) {
|
||||
pointed_pos_under = pointed_object->getBasePosition();
|
||||
pointed_pos_above = pointed_pos_under;
|
||||
}
|
||||
|
||||
/*
|
||||
Make sure the player is allowed to do it
|
||||
*/
|
||||
|
|
@ -1020,16 +1005,19 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
|
|||
actionstream << player->getName() << " attempted to interact with " <<
|
||||
pointed.dump() << " without 'interact' privilege" << std::endl;
|
||||
|
||||
if (pointed.type != POINTEDTHING_NODE)
|
||||
return;
|
||||
|
||||
// Re-send block to revert change on client-side
|
||||
RemoteClient *client = getClient(peer_id);
|
||||
// Digging completed -> under
|
||||
if (action == INTERACT_DIGGING_COMPLETED) {
|
||||
v3s16 blockpos = getNodeBlockPos(floatToInt(pointed_pos_under, BS));
|
||||
v3s16 blockpos = getNodeBlockPos(pointed.node_undersurface);
|
||||
client->SetBlockNotSent(blockpos);
|
||||
}
|
||||
// Placement -> above
|
||||
else if (action == INTERACT_PLACE) {
|
||||
v3s16 blockpos = getNodeBlockPos(floatToInt(pointed_pos_above, BS));
|
||||
v3s16 blockpos = getNodeBlockPos(pointed.node_abovesurface);
|
||||
client->SetBlockNotSent(blockpos);
|
||||
}
|
||||
return;
|
||||
|
|
@ -1037,7 +1025,6 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
|
|||
|
||||
/*
|
||||
Check that target is reasonably close
|
||||
(only when digging or placing things)
|
||||
*/
|
||||
static thread_local const bool enable_anticheat =
|
||||
!g_settings->getBool("disable_anticheat");
|
||||
|
|
@ -1045,12 +1032,19 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
|
|||
if ((action == INTERACT_START_DIGGING || action == INTERACT_DIGGING_COMPLETED ||
|
||||
action == INTERACT_PLACE || action == INTERACT_USE) &&
|
||||
enable_anticheat && !isSingleplayer()) {
|
||||
float d = playersao->getEyePosition().getDistanceFrom(pointed_pos_under);
|
||||
v3f target_pos = player_pos;
|
||||
if (pointed.type == POINTEDTHING_NODE) {
|
||||
target_pos = intToFloat(pointed.node_undersurface, BS);
|
||||
} else if (pointed.type == POINTEDTHING_OBJECT) {
|
||||
target_pos = pointed_object->getBasePosition();
|
||||
}
|
||||
float d = playersao->getEyePosition().getDistanceFrom(target_pos);
|
||||
|
||||
if (!checkInteractDistance(player, d, pointed.dump())) {
|
||||
if (!checkInteractDistance(player, d, pointed.dump())
|
||||
&& pointed.type == POINTEDTHING_NODE) {
|
||||
// Re-send block to revert change on client-side
|
||||
RemoteClient *client = getClient(peer_id);
|
||||
v3s16 blockpos = getNodeBlockPos(floatToInt(pointed_pos_under, BS));
|
||||
v3s16 blockpos = getNodeBlockPos(pointed.node_undersurface);
|
||||
client->SetBlockNotSent(blockpos);
|
||||
return;
|
||||
}
|
||||
|
|
@ -1062,20 +1056,20 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
|
|||
RollbackScopeActor rollback_scope(m_rollback,
|
||||
std::string("player:")+player->getName());
|
||||
|
||||
/*
|
||||
0: start digging or punch object
|
||||
*/
|
||||
if (action == INTERACT_START_DIGGING) {
|
||||
switch (action) {
|
||||
// Start digging or punch object
|
||||
case INTERACT_START_DIGGING: {
|
||||
if (pointed.type == POINTEDTHING_NODE) {
|
||||
MapNode n(CONTENT_IGNORE);
|
||||
bool pos_ok;
|
||||
|
||||
v3s16 p_under = pointed.node_undersurface;
|
||||
n = m_env->getMap().getNode(p_under, &pos_ok);
|
||||
if (!pos_ok) {
|
||||
infostream << "Server: Not punching: Node not found. "
|
||||
"Adding block to emerge queue." << std::endl;
|
||||
m_emerge->enqueueBlockEmerge(peer_id, getNodeBlockPos(p_above),
|
||||
false);
|
||||
m_emerge->enqueueBlockEmerge(peer_id,
|
||||
getNodeBlockPos(pointed.node_abovesurface), false);
|
||||
}
|
||||
|
||||
if (n.getContent() != CONTENT_IGNORE)
|
||||
|
|
@ -1083,10 +1077,12 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
|
|||
|
||||
// Cheat prevention
|
||||
playersao->noCheatDigStart(p_under);
|
||||
|
||||
return;
|
||||
}
|
||||
else if (pointed.type == POINTEDTHING_OBJECT) {
|
||||
// Skip if object can't be interacted with anymore
|
||||
if (pointed_object->isGone())
|
||||
|
||||
// Skip if the object can't be interacted with anymore
|
||||
if (pointed.type != POINTEDTHING_OBJECT || pointed_object->isGone())
|
||||
return;
|
||||
|
||||
ItemStack selected_item, hand_item;
|
||||
|
|
@ -1122,29 +1118,26 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
|
|||
if (dst_origin_hp != playersao->getHP())
|
||||
SendPlayerHPOrDie(playersao,
|
||||
PlayerHPChangeReason(PlayerHPChangeReason::PLAYER_PUNCH, pointed_object));
|
||||
}
|
||||
|
||||
return;
|
||||
} // action == INTERACT_START_DIGGING
|
||||
|
||||
/*
|
||||
1: stop digging
|
||||
*/
|
||||
else if (action == INTERACT_STOP_DIGGING) {
|
||||
} // action == INTERACT_STOP_DIGGING
|
||||
case INTERACT_STOP_DIGGING:
|
||||
// Nothing to do
|
||||
return;
|
||||
|
||||
/*
|
||||
2: Digging completed
|
||||
*/
|
||||
else if (action == INTERACT_DIGGING_COMPLETED) {
|
||||
case INTERACT_DIGGING_COMPLETED: {
|
||||
// Only digging of nodes
|
||||
if (pointed.type == POINTEDTHING_NODE) {
|
||||
if (pointed.type != POINTEDTHING_NODE)
|
||||
return;
|
||||
bool pos_ok;
|
||||
v3s16 p_under = pointed.node_undersurface;
|
||||
MapNode n = m_env->getMap().getNode(p_under, &pos_ok);
|
||||
if (!pos_ok) {
|
||||
infostream << "Server: Not finishing digging: Node not found. "
|
||||
"Adding block to emerge queue." << std::endl;
|
||||
m_emerge->enqueueBlockEmerge(peer_id, getNodeBlockPos(p_above),
|
||||
false);
|
||||
m_emerge->enqueueBlockEmerge(peer_id,
|
||||
getNodeBlockPos(pointed.node_abovesurface), false);
|
||||
}
|
||||
|
||||
/* Cheat prevention */
|
||||
|
|
@ -1219,23 +1212,20 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
|
|||
if (is_valid_dig && n.getContent() != CONTENT_IGNORE)
|
||||
m_script->node_on_dig(p_under, n, playersao);
|
||||
|
||||
v3s16 blockpos = getNodeBlockPos(floatToInt(pointed_pos_under, BS));
|
||||
v3s16 blockpos = getNodeBlockPos(p_under);
|
||||
RemoteClient *client = getClient(peer_id);
|
||||
// Send unusual result (that is, node not being removed)
|
||||
if (m_env->getMap().getNode(p_under).getContent() != CONTENT_AIR) {
|
||||
if (m_env->getMap().getNode(p_under).getContent() != CONTENT_AIR)
|
||||
// Re-send block to revert change on client-side
|
||||
client->SetBlockNotSent(blockpos);
|
||||
}
|
||||
else {
|
||||
else
|
||||
client->ResendBlockIfOnWire(blockpos);
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
} // action == INTERACT_DIGGING_COMPLETED
|
||||
|
||||
/*
|
||||
3: place block or right-click object
|
||||
*/
|
||||
else if (action == INTERACT_PLACE) {
|
||||
// Place block or right-click object
|
||||
case INTERACT_PLACE: {
|
||||
ItemStack selected_item;
|
||||
playersao->getWieldedItem(&selected_item, nullptr);
|
||||
|
||||
|
|
@ -1264,59 +1254,54 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
|
|||
}
|
||||
|
||||
pointed_object->rightClick(playersao);
|
||||
} else if (m_script->item_OnPlace(
|
||||
selected_item, playersao, pointed)) {
|
||||
} else if (m_script->item_OnPlace(selected_item, playersao, pointed)) {
|
||||
// Placement was handled in lua
|
||||
|
||||
// Apply returned ItemStack
|
||||
if (playersao->setWieldedItem(selected_item)) {
|
||||
if (playersao->setWieldedItem(selected_item))
|
||||
SendInventory(playersao, true);
|
||||
}
|
||||
}
|
||||
|
||||
if (pointed.type != POINTEDTHING_NODE)
|
||||
return;
|
||||
|
||||
// If item has node placement prediction, always send the
|
||||
// blocks to make sure the client knows what exactly happened
|
||||
RemoteClient *client = getClient(peer_id);
|
||||
v3s16 blockpos = getNodeBlockPos(floatToInt(pointed_pos_above, BS));
|
||||
v3s16 blockpos2 = getNodeBlockPos(floatToInt(pointed_pos_under, BS));
|
||||
if (!selected_item.getDefinition(m_itemdef).node_placement_prediction.empty()) {
|
||||
v3s16 blockpos = getNodeBlockPos(pointed.node_abovesurface);
|
||||
v3s16 blockpos2 = getNodeBlockPos(pointed.node_undersurface);
|
||||
if (!selected_item.getDefinition(m_itemdef
|
||||
).node_placement_prediction.empty()) {
|
||||
client->SetBlockNotSent(blockpos);
|
||||
if (blockpos2 != blockpos) {
|
||||
if (blockpos2 != blockpos)
|
||||
client->SetBlockNotSent(blockpos2);
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
client->ResendBlockIfOnWire(blockpos);
|
||||
if (blockpos2 != blockpos) {
|
||||
if (blockpos2 != blockpos)
|
||||
client->ResendBlockIfOnWire(blockpos2);
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
} // action == INTERACT_PLACE
|
||||
|
||||
/*
|
||||
4: use
|
||||
*/
|
||||
else if (action == INTERACT_USE) {
|
||||
case INTERACT_USE: {
|
||||
ItemStack selected_item;
|
||||
playersao->getWieldedItem(&selected_item, nullptr);
|
||||
|
||||
actionstream << player->getName() << " uses " << selected_item.name
|
||||
<< ", pointing at " << pointed.dump() << std::endl;
|
||||
|
||||
if (m_script->item_OnUse(
|
||||
selected_item, playersao, pointed)) {
|
||||
if (m_script->item_OnUse(selected_item, playersao, pointed)) {
|
||||
// Apply returned ItemStack
|
||||
if (playersao->setWieldedItem(selected_item)) {
|
||||
if (playersao->setWieldedItem(selected_item))
|
||||
SendInventory(playersao, true);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
} // action == INTERACT_USE
|
||||
|
||||
/*
|
||||
5: rightclick air
|
||||
*/
|
||||
else if (action == INTERACT_ACTIVATE) {
|
||||
// Rightclick air
|
||||
case INTERACT_ACTIVATE: {
|
||||
ItemStack selected_item;
|
||||
playersao->getWieldedItem(&selected_item, nullptr);
|
||||
|
||||
|
|
@ -1325,21 +1310,17 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
|
|||
|
||||
pointed.type = POINTEDTHING_NOTHING; // can only ever be NOTHING
|
||||
|
||||
if (m_script->item_OnSecondaryUse(
|
||||
selected_item, playersao, pointed)) {
|
||||
if (playersao->setWieldedItem(selected_item)) {
|
||||
if (m_script->item_OnSecondaryUse(selected_item, playersao, pointed)) {
|
||||
if (playersao->setWieldedItem(selected_item))
|
||||
SendInventory(playersao, true);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
} // action == INTERACT_ACTIVATE
|
||||
|
||||
default:
|
||||
warningstream << "Server: Invalid action " << action << std::endl;
|
||||
|
||||
/*
|
||||
Catch invalid actions
|
||||
*/
|
||||
else {
|
||||
warningstream << "Server: Invalid action "
|
||||
<< action << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue