Skip to content
Permalink
Browse files

Prevent interacting with items out of the hotbar (#10359)

  • Loading branch information
Lejo1 committed Sep 4, 2020
1 parent 9faeca3 commit 6dcc9e63318f815a3de8c9db2ee7b845066e0135
Showing with 20 additions and 1 deletion.
  1. +20 −1 src/network/serverpackethandler.cpp
@@ -636,7 +636,7 @@ void Server::handleCommand_InventoryAction(NetworkPacket* pkt)
return;
from_inv_is_current_player = true;
}

bool to_inv_is_current_player = false;
if (ma->to_inv.type == InventoryLocation::PLAYER) {
if (ma->to_inv.name != player->getName())
@@ -869,6 +869,15 @@ void Server::handleCommand_PlayerItem(NetworkPacket* pkt)

*pkt >> item;

if (item >= player->getHotbarItemcount()) {
actionstream << "Player: " << player->getName()
<< " tried to access item=" << item
<< " out of hotbar_itemcount="
<< player->getHotbarItemcount()
<< "; ignoring." << std::endl;
return;
}

playersao->getPlayer()->setWieldIndex(item);
}

@@ -984,6 +993,16 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
v3f player_pos = playersao->getLastGoodPosition();

// Update wielded item

if (item_i >= player->getHotbarItemcount()) {
actionstream << "Player: " << player->getName()
<< " tried to access item=" << item_i
<< " out of hotbar_itemcount="
<< player->getHotbarItemcount()
<< "; ignoring." << std::endl;
return;
}

playersao->getPlayer()->setWieldIndex(item_i);

// Get pointed to object (NULL if not POINTEDTYPE_OBJECT)

0 comments on commit 6dcc9e6

Please sign in to comment.
You can’t perform that action at this time.