diff options
author | madmaxoft <github@xoft.cz> | 2014-01-25 15:37:00 +0100 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2014-01-25 15:37:00 +0100 |
commit | a2dfb2853718cc8bf73b954e5b678c12d93c815c (patch) | |
tree | b793ef13c8793cf4943659d75fcbe10cb4074daf /src/ClientHandle.cpp | |
parent | Removed unnecessary define (diff) | |
parent | Comm logging is available in both Debug and Release modes. (diff) | |
download | cuberite-a2dfb2853718cc8bf73b954e5b678c12d93c815c.tar cuberite-a2dfb2853718cc8bf73b954e5b678c12d93c815c.tar.gz cuberite-a2dfb2853718cc8bf73b954e5b678c12d93c815c.tar.bz2 cuberite-a2dfb2853718cc8bf73b954e5b678c12d93c815c.tar.lz cuberite-a2dfb2853718cc8bf73b954e5b678c12d93c815c.tar.xz cuberite-a2dfb2853718cc8bf73b954e5b678c12d93c815c.tar.zst cuberite-a2dfb2853718cc8bf73b954e5b678c12d93c815c.zip |
Diffstat (limited to 'src/ClientHandle.cpp')
-rw-r--r-- | src/ClientHandle.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp index ed04edac0..56ad4e4ba 100644 --- a/src/ClientHandle.cpp +++ b/src/ClientHandle.cpp @@ -148,15 +148,6 @@ cClientHandle::~cClientHandle() SendDisconnect("Server shut down? Kthnxbai"); } - // Queue all remaining outgoing packets to cSocketThreads: - { - cCSLock Lock(m_CSOutgoingData); - AString Data; - m_OutgoingData.ReadAll(Data); - m_OutgoingData.CommitRead(); - cRoot::Get()->GetServer()->WriteToClient(this, Data); - } - // Close the socket as soon as it sends all outgoing data: cRoot::Get()->GetServer()->RemoveClient(this); @@ -657,7 +648,8 @@ void cClientHandle::HandleLeftClick(int a_BlockX, int a_BlockY, int a_BlockZ, ch // A plugin doesn't agree with the tossing. The plugin itself is responsible for handling the consequences (possible inventory mismatch) return; } - m_Player->TossItem(false); + + m_Player->TossEquippedItem(); return; } @@ -712,7 +704,7 @@ void cClientHandle::HandleLeftClick(int a_BlockX, int a_BlockY, int a_BlockZ, ch // A plugin doesn't agree with the tossing. The plugin itself is responsible for handling the consequences (possible inventory mismatch) return; } - m_Player->TossItem(false, 64); // Toss entire slot - if there aren't enough items, the maximum will be ejected + m_Player->TossEquippedItem(64); // Toss entire slot - if there aren't enough items, the maximum will be ejected return; } |