diff options
| author | Tiger Wang <ziwei.tiger@outlook.com> | 2022-07-11 00:55:11 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@outlook.com> | 2022-07-19 23:33:09 +0200 |
| commit | cd97aa83307ce33068082dc57deee8d922fec432 (patch) | |
| tree | 7ea02bf81e102e80df32d527a085c3ecd3f66d44 /src/Protocol | |
| parent | ClientHandle: fix incorrect position floor (diff) | |
| download | cuberite-Pickups.tar cuberite-Pickups.tar.gz cuberite-Pickups.tar.bz2 cuberite-Pickups.tar.lz cuberite-Pickups.tar.xz cuberite-Pickups.tar.zst cuberite-Pickups.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Protocol/Protocol.h | 2 | ||||
| -rw-r--r-- | src/Protocol/Protocol_1_11.cpp | 2 | ||||
| -rw-r--r-- | src/Protocol/Protocol_1_11.h | 2 | ||||
| -rw-r--r-- | src/Protocol/Protocol_1_8.cpp | 2 | ||||
| -rw-r--r-- | src/Protocol/Protocol_1_8.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/Protocol/Protocol.h b/src/Protocol/Protocol.h index f1d85f014..cbaffb052 100644 --- a/src/Protocol/Protocol.h +++ b/src/Protocol/Protocol.h @@ -387,7 +387,7 @@ public: virtual void SendChat (const cCompositeChat & a_Message, eChatType a_Type, bool a_ShouldUseChatPrefixes) = 0; virtual void SendChatRaw (const AString & a_MessageRaw, eChatType a_Type) = 0; virtual void SendChunkData (ContiguousByteBufferView a_ChunkData) = 0; - virtual void SendCollectEntity (const cEntity & a_Collected, const cEntity & a_Collector, unsigned a_Count) = 0; + virtual void SendCollectEntity (const cEntity & a_Collected, const cPawn & a_Collector, unsigned a_Count) = 0; virtual void SendDestroyEntity (const cEntity & a_Entity) = 0; virtual void SendDetachEntity (const cEntity & a_Entity, const cEntity & a_PreviousVehicle) = 0; virtual void SendDisconnect (const AString & a_Reason) = 0; diff --git a/src/Protocol/Protocol_1_11.cpp b/src/Protocol/Protocol_1_11.cpp index 73951fb70..cc41ebcd6 100644 --- a/src/Protocol/Protocol_1_11.cpp +++ b/src/Protocol/Protocol_1_11.cpp @@ -319,7 +319,7 @@ namespace Metadata_1_11 //////////////////////////////////////////////////////////////////////////////// // cProtocol_1_11_0: -void cProtocol_1_11_0::SendCollectEntity(const cEntity & a_Collected, const cEntity & a_Collector, unsigned a_Count) +void cProtocol_1_11_0::SendCollectEntity(const cEntity & a_Collected, const cPawn & a_Collector, unsigned a_Count) { ASSERT(m_State == 3); // In game mode? diff --git a/src/Protocol/Protocol_1_11.h b/src/Protocol/Protocol_1_11.h index 5bf03a9dd..1e583b31b 100644 --- a/src/Protocol/Protocol_1_11.h +++ b/src/Protocol/Protocol_1_11.h @@ -32,7 +32,7 @@ public: protected: - virtual void SendCollectEntity (const cEntity & a_Collected, const cEntity & a_Collector, unsigned a_Count) override; + virtual void SendCollectEntity (const cEntity & a_Collected, const cPawn & a_Collector, unsigned a_Count) override; virtual void SendEntityAnimation (const cEntity & a_Entity, EntityAnimation a_Animation) override; virtual void SendHideTitle (void) override; virtual void SendResetTitle (void) override; diff --git a/src/Protocol/Protocol_1_8.cpp b/src/Protocol/Protocol_1_8.cpp index cbb13e68e..e175223b6 100644 --- a/src/Protocol/Protocol_1_8.cpp +++ b/src/Protocol/Protocol_1_8.cpp @@ -372,7 +372,7 @@ void cProtocol_1_8_0::SendChunkData(const ContiguousByteBufferView a_ChunkData) -void cProtocol_1_8_0::SendCollectEntity(const cEntity & a_Collected, const cEntity & a_Collector, unsigned a_Count) +void cProtocol_1_8_0::SendCollectEntity(const cEntity & a_Collected, const cPawn & a_Collector, unsigned a_Count) { UNUSED(a_Count); ASSERT(m_State == 3); // In game mode? diff --git a/src/Protocol/Protocol_1_8.h b/src/Protocol/Protocol_1_8.h index eaa8813be..eec8dd014 100644 --- a/src/Protocol/Protocol_1_8.h +++ b/src/Protocol/Protocol_1_8.h @@ -56,7 +56,7 @@ public: virtual void SendChat (const cCompositeChat & a_Message, eChatType a_Type, bool a_ShouldUseChatPrefixes) override; virtual void SendChatRaw (const AString & a_MessageRaw, eChatType a_Type) override; virtual void SendChunkData (ContiguousByteBufferView a_ChunkData) override; - virtual void SendCollectEntity (const cEntity & a_Collected, const cEntity & a_Collector, unsigned a_Count) override; + virtual void SendCollectEntity (const cEntity & a_Collected, const cPawn & a_Collector, unsigned a_Count) override; virtual void SendDestroyEntity (const cEntity & a_Entity) override; virtual void SendDetachEntity (const cEntity & a_Entity, const cEntity & a_PreviousVehicle) override; virtual void SendDisconnect (const AString & a_Reason) override; |