diff options
Diffstat (limited to '')
| -rw-r--r-- | src/ClientHandle.cpp | 56 |
1 files changed, 54 insertions, 2 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp index 8df60ad40..469095b19 100644 --- a/src/ClientHandle.cpp +++ b/src/ClientHandle.cpp @@ -7,6 +7,7 @@ #include "Entities/Pickup.h" #include "Bindings/PluginManager.h" #include "Entities/Player.h" +#include "Entities/Minecart.h" #include "Inventory.h" #include "EffectID.h" #include "BlockEntities/BeaconEntity.h" @@ -1412,7 +1413,7 @@ void cClientHandle::HandleRightClick(int a_BlockX, int a_BlockY, int a_BlockZ, e World->GetBlockTypeMeta(a_BlockX, a_BlockY, a_BlockZ, BlockType, BlockMeta); cBlockHandler * BlockHandler = cBlockInfo::GetHandler(BlockType); - if (BlockHandler->IsUseable() && !m_Player->IsCrouched()) + if (BlockHandler->IsUseable() && !m_Player->IsCrouched() && (!m_Player->IsGameModeSpectator() || cBlockInfo::IsUseableBySpectator(BlockType))) { if (!PlgMgr->CallHookPlayerUsingBlock(*m_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, BlockType, BlockMeta)) { @@ -1427,6 +1428,12 @@ void cClientHandle::HandleRightClick(int a_BlockX, int a_BlockY, int a_BlockZ, e } } + // Players, who spectate cannot use their items + if (m_Player->IsGameModeSpectator()) + { + return; + } + short EquippedDamage = Equipped.m_ItemDamage; cItemHandler * ItemHandler = cItemHandler::GetItemHandler(Equipped.m_ItemType); @@ -1557,6 +1564,19 @@ void cClientHandle::HandleSlotSelected(Int16 a_SlotNum) +void cClientHandle::HandleSpectate(const AString & a_PlayerUUID) +{ + m_Player->GetWorld()->DoWithPlayerByUUID(a_PlayerUUID, [=](cPlayer * a_ToSpectate) + { + m_Player->TeleportToEntity(*a_ToSpectate); + return true; + }); +} + + + + + void cClientHandle::HandleSteerVehicle(float a_Forward, float a_Sideways) { m_Player->SteerVehicle(a_Forward, a_Sideways); @@ -1617,6 +1637,17 @@ void cClientHandle::HandleUseEntity(UInt32 a_TargetEntityID, bool a_IsLeftClick) { // TODO: Let plugins interfere via a hook + // If the player is a spectator, let him spectate + if (m_Player->IsGameModeSpectator() && a_IsLeftClick) + { + m_Player->GetWorld()->DoWithEntityByID(a_TargetEntityID, [=](cEntity * a_Entity) + { + m_Player->AttachTo(a_Entity); + return true; + }); + return; + } + // If it is a right click, call the entity's OnRightClicked() handler: if (!a_IsLeftClick) { @@ -1625,7 +1656,19 @@ void cClientHandle::HandleUseEntity(UInt32 a_TargetEntityID, bool a_IsLeftClick) cPlayer & m_Player; virtual bool Item(cEntity * a_Entity) override { - if (cPluginManager::Get()->CallHookPlayerRightClickingEntity(m_Player, *a_Entity)) + if ( + cPluginManager::Get()->CallHookPlayerRightClickingEntity(m_Player, *a_Entity) || + ( + m_Player.IsGameModeSpectator() && // Spectators cannot interact with every entity + ( + !a_Entity->IsMinecart() || // They can only interact with minecarts + ( + (reinterpret_cast<cMinecart *>(a_Entity)->GetPayload() != cMinecart::mpChest) && // And only if the type matches a minecart with a chest or + (reinterpret_cast<cMinecart *>(a_Entity)->GetPayload() != cMinecart::mpHopper) // a minecart with a hopper + ) + ) + ) + ) { return false; } @@ -2178,6 +2221,15 @@ void cClientHandle::SendBlockChanges(int a_ChunkX, int a_ChunkZ, const sSetBlock +void cClientHandle::SendCameraSetTo(const cEntity & a_Entity) +{ + m_Protocol->SendCameraSetTo(a_Entity); +} + + + + + void cClientHandle::SendChat(const AString & a_Message, eMessageType a_ChatPrefix, const AString & a_AdditionalData) { cWorld * World = GetPlayer()->GetWorld(); |