summaryrefslogtreecommitdiff
path: root/src/inventorymanager.cpp
diff options
context:
space:
mode:
authorTeTpaAka <TeTpaAka@users.noreply.github.com>2015-05-29 20:30:55 +0200
committerparamat <mat.gregory@virginmedia.com>2017-07-21 02:03:22 +0100
commit49920cfe8dc7869bb8235c6fe2b8ef26e2a523ca (patch)
tree4ef6f620933a5af6e845bf5cb2a4c448331bb5b1 /src/inventorymanager.cpp
parent5045bdc6d81445ecf600ff9c268886cada935a7f (diff)
downloadminetest-49920cfe8dc7869bb8235c6fe2b8ef26e2a523ca.tar.gz
minetest-49920cfe8dc7869bb8235c6fe2b8ef26e2a523ca.tar.bz2
minetest-49920cfe8dc7869bb8235c6fe2b8ef26e2a523ca.zip
Player collisionbox: Make settable
Breaks compatibility with old clients.
Diffstat (limited to 'src/inventorymanager.cpp')
-rw-r--r--src/inventorymanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp
index fe37bcd83..0d44e9cda 100644
--- a/src/inventorymanager.cpp
+++ b/src/inventorymanager.cpp
@@ -611,8 +611,8 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
// Drop the item
ItemStack item1 = list_from->getItem(from_i);
item1.count = take_count;
- if (PLAYER_TO_SA(player)->item_OnDrop(item1, player,
- player->getBasePosition() + v3f(0,1,0))) {
+ if(PLAYER_TO_SA(player)->item_OnDrop(item1, player,
+ player->getBasePosition())) {
actually_dropped_count = take_count - item1.count;
if (actually_dropped_count == 0) {
@@ -815,7 +815,7 @@ void ICraftAction::apply(InventoryManager *mgr,
u16 count = it->count;
do {
PLAYER_TO_SA(player)->item_OnDrop(*it, player,
- player->getBasePosition() + v3f(0,1,0));
+ player->getBasePosition());
if (count >= it->count) {
errorstream << "Couldn't drop replacement stack " <<
it->getItemString() << " because drop loop didn't "