summaryrefslogtreecommitdiffstats
path: root/src/UI
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-01-24 08:55:41 +0100
committermadmaxoft <github@xoft.cz>2014-01-24 08:55:41 +0100
commit8a254faaf7909fec390f1fda6e2cf060fda13462 (patch)
tree9617be2f24f8385ba20195d094800d3e5aaedd49 /src/UI
parentFixed flint&steel failure on the Y world edges. (diff)
parentFixed indentation once and for all. (diff)
downloadcuberite-8a254faaf7909fec390f1fda6e2cf060fda13462.tar
cuberite-8a254faaf7909fec390f1fda6e2cf060fda13462.tar.gz
cuberite-8a254faaf7909fec390f1fda6e2cf060fda13462.tar.bz2
cuberite-8a254faaf7909fec390f1fda6e2cf060fda13462.tar.lz
cuberite-8a254faaf7909fec390f1fda6e2cf060fda13462.tar.xz
cuberite-8a254faaf7909fec390f1fda6e2cf060fda13462.tar.zst
cuberite-8a254faaf7909fec390f1fda6e2cf060fda13462.zip
Diffstat (limited to 'src/UI')
-rw-r--r--src/UI/Window.cpp31
1 files changed, 27 insertions, 4 deletions
diff --git a/src/UI/Window.cpp b/src/UI/Window.cpp
index 3ffeff7a0..1a8456f70 100644
--- a/src/UI/Window.cpp
+++ b/src/UI/Window.cpp
@@ -13,7 +13,8 @@
#include "../BlockEntities/DropSpenserEntity.h"
#include "../BlockEntities/EnderChestEntity.h"
#include "../BlockEntities/HopperEntity.h"
-
+#include "../Root.h"
+#include "../Bindings/PluginManager.h"
@@ -169,6 +170,7 @@ void cWindow::Clicked(
const cItem & a_ClickedItem
)
{
+ cPluginManager * PlgMgr = cRoot::Get()->GetPluginManager();
if (a_WindowID != m_WindowID)
{
LOGWARNING("%s: Wrong window ID (exp %d, got %d) received from \"%s\"; ignoring click.", __FUNCTION__, m_WindowID, a_WindowID, a_Player.GetName().c_str());
@@ -179,14 +181,35 @@ void cWindow::Clicked(
{
case caRightClickOutside:
{
+ if (PlgMgr->CallHookPlayerTossingItem(a_Player))
+ {
+ // A plugin doesn't agree with the tossing. The plugin itself is responsible for handling the consequences (possible inventory mismatch)
+ return;
+ }
+ if (a_Player.IsGameModeCreative())
+ {
+ a_Player.TossPickup(a_ClickedItem);
+ }
+
// Toss one of the dragged items:
- a_Player.TossItem(true);
+ a_Player.TossHeldItem();
return;
}
case caLeftClickOutside:
{
+ if (PlgMgr->CallHookPlayerTossingItem(a_Player))
+ {
+ // A plugin doesn't agree with the tossing. The plugin itself is responsible for handling the consequences (possible inventory mismatch)
+ return;
+ }
+
+ if (a_Player.IsGameModeCreative())
+ {
+ a_Player.TossPickup(a_ClickedItem);
+ }
+
// Toss all dragged items:
- a_Player.TossItem(true, a_Player.GetDraggingItem().m_ItemCount);
+ a_Player.TossHeldItem(a_Player.GetDraggingItem().m_ItemCount);
return;
}
case caLeftClickOutsideHoldNothing:
@@ -263,7 +286,7 @@ bool cWindow::ClosedByPlayer(cPlayer & a_Player, bool a_CanRefuse)
if (a_Player.IsDraggingItem())
{
LOGD("Player holds item! Dropping it...");
- a_Player.TossItem(true, a_Player.GetDraggingItem().m_ItemCount);
+ a_Player.TossHeldItem(a_Player.GetDraggingItem().m_ItemCount);
}
cClientHandle * ClientHandle = a_Player.GetClientHandle();