From 4aed49a70fe2e4fa3600b31525766c52bff52e3d Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Thu, 4 Apr 2013 11:47:31 +0000 Subject: Fixed personal crafting grid not being tossed on inventory close. FS #355, http://www.mc-server.org/support/index.php?do=details&task_id=355 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1358 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Player.cpp | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'source/Player.cpp') diff --git a/source/Player.cpp b/source/Player.cpp index a96967360..af2e00570 100644 --- a/source/Player.cpp +++ b/source/Player.cpp @@ -455,27 +455,8 @@ void cPlayer::OpenWindow( cWindow* a_Window ) void cPlayer::CloseWindow(char a_WindowType) { - if (m_CurrentWindow == m_InventoryWindow) - { - // The inventory window must not be closed and must not be even sent a close packet - if (IsDraggingItem()) // But we need to check if player is holding anything - { - LOGD("Player holds item in inventory window! Dropping it..."); - TossItem(true, GetDraggingItem().m_ItemCount); - } - return; - } - if (m_CurrentWindow != NULL) { - // TODO: This code should be in cChestWindow instead - if ((a_WindowType == 1) && (m_CurrentWindow->GetWindowType() == cWindow::Chest)) - { - int x, y, z; - m_CurrentWindow->GetOwner()->GetBlockPos(x, y, z); - m_World->BroadcastBlockAction(x, y, z, 1, 0, E_BLOCK_CHEST); - } - m_CurrentWindow->ClosedByPlayer(*this); } m_CurrentWindow = m_InventoryWindow; -- cgit v1.2.3