flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fix one definition rule violations

Browse Source
This commit is contained in:
Tiger Wang
2020-05-04 11:50:02 +01:00
parent 9b68fab8ed
commit eb3ca16921
6 changed files with 79 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Protocol/Protocol_1_12.cpp
View File

@@ -42,9 +42,9 @@ Implements the 1.12 protocol classes:
#pragma clang diagnostic ignored "-Wduplicate-enum"
#endif
namespace Metadata
namespace Metadata_1_12
{
enum Metadata_Index
enum MetadataIndex
{
// Entity
ENTITY_FLAGS,
@@ -372,7 +372,7 @@ void cProtocol_1_12::HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer)
void cProtocol_1_12::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_Entity)
{
using namespace Metadata;
using namespace Metadata_1_12;
// Common metadata:
Int8 Flags = 0;
@@ -579,7 +579,7 @@ void cProtocol_1_12::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_
void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mob)
{
using namespace Metadata;
using namespace Metadata_1_12;
// Living Enitiy Metadata
if (a_Mob.HasCustomName())