diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-07-01 20:34:50 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-07-01 20:34:50 +0200 |
| commit | 64e66674355c84c091564197dcbdf26806e61659 (patch) | |
| tree | beddb9e6293e4bb3a7aba04d1d7901f1e0af27e0 | |
| parent | Fix server-crash with non-existing items. (diff) | |
| download | cuberite-64e66674355c84c091564197dcbdf26806e61659.tar cuberite-64e66674355c84c091564197dcbdf26806e61659.tar.gz cuberite-64e66674355c84c091564197dcbdf26806e61659.tar.bz2 cuberite-64e66674355c84c091564197dcbdf26806e61659.tar.lz cuberite-64e66674355c84c091564197dcbdf26806e61659.tar.xz cuberite-64e66674355c84c091564197dcbdf26806e61659.tar.zst cuberite-64e66674355c84c091564197dcbdf26806e61659.zip | |
| -rw-r--r-- | src/Items/ItemHandler.cpp | 2 | ||||
| -rw-r--r-- | src/UI/Window.cpp | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp index 0f56b2b90..423039cf4 100644 --- a/src/Items/ItemHandler.cpp +++ b/src/Items/ItemHandler.cpp @@ -63,7 +63,7 @@ cItemHandler * cItemHandler::m_ItemHandler[2268]; cItemHandler * cItemHandler::GetItemHandler(int a_ItemType) { - if ((a_ItemType < 0) || (a_ItemType >= ARRAYCOUNT(m_ItemHandler)) || (!IsValidBlock(a_ItemType) && !IsValidItem(a_ItemType))) + if ((a_ItemType < 0) || ((unsigned long)a_ItemType >= ARRAYCOUNT(m_ItemHandler))) { // Either nothing (-1), or bad value, both cases should return the air handler if (a_ItemType < -1) diff --git a/src/UI/Window.cpp b/src/UI/Window.cpp index af3e3e45c..e465b701a 100644 --- a/src/UI/Window.cpp +++ b/src/UI/Window.cpp @@ -170,12 +170,6 @@ void cWindow::Clicked( const cItem & a_ClickedItem ) { - if (!IsValidItem(a_ClickedItem.m_ItemType) && !IsValidBlock(a_ClickedItem.m_ItemType)) - { - LOGWARNING("%s: Player \"%s\" clicked to a non-existing item; ignoring click.", __FUNCTION__, a_Player.GetName().c_str()); - return; - } - cPluginManager * PlgMgr = cRoot::Get()->GetPluginManager(); if (a_WindowID != m_WindowID) { |