Skip to content
Permalink
Browse files

Inventory: Undo prediction on drop

  • Loading branch information
SmallJoker committed Sep 17, 2019
1 parent 1db3d25 commit e0a85fae01287fb06c0d29fc309067d18286b100
Showing with 7 additions and 6 deletions.
  1. +6 −6 src/inventorymanager.cpp
  2. +1 −0 src/server.cpp
@@ -646,8 +646,6 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
if (src_can_take_count != -1 && src_can_take_count < take_count)
take_count = src_can_take_count;

int actually_dropped_count = 0;

// Update item due executed callbacks
src_item = list_from->getItem(from_i);

@@ -656,10 +654,12 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
item1.count = take_count;
if(PLAYER_TO_SA(player)->item_OnDrop(item1, player,
player->getBasePosition())) {
actually_dropped_count = take_count - item1.count;
int actually_dropped_count = take_count - item1.count;

if (actually_dropped_count == 0) {
infostream<<"Actually dropped no items"<<std::endl;
// Revert client prediction
mgr->setInventoryModified(from_inv);
return;
}

@@ -670,9 +670,10 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame

if (item2.count != actually_dropped_count)
errorstream<<"Could not take dropped count of items"<<std::endl;

mgr->setInventoryModified(from_inv);
}

src_item.count = actually_dropped_count;
mgr->setInventoryModified(from_inv);
}

infostream<<"IDropAction::apply(): dropped "
@@ -681,7 +682,6 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
<<" i="<<from_i
<<std::endl;

src_item.count = actually_dropped_count;

/*
Report drop to endpoints
@@ -1151,6 +1151,7 @@ void Server::setInventoryModified(const InventoryLocation &loc)
return;

player->setModified(true);
player->inventory.setModified(true);
// Updates are sent in ServerEnvironment::step()
}
break;

0 comments on commit e0a85fa

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