From eb3ca16921080b1496d2e71de95ce533929241e1 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 4 May 2020 11:50:02 +0100 Subject: Fix one definition rule violations --- src/Protocol/Protocol_1_11.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Protocol/Protocol_1_11.cpp') diff --git a/src/Protocol/Protocol_1_11.cpp b/src/Protocol/Protocol_1_11.cpp index 677662a6f..b12b45814 100644 --- a/src/Protocol/Protocol_1_11.cpp +++ b/src/Protocol/Protocol_1_11.cpp @@ -58,9 +58,9 @@ Implements the 1.11 protocol classes: #pragma clang diagnostic ignored "-Wduplicate-enum" #endif -namespace Metadata +namespace Metadata_1_11 { - enum Metadata_Index + enum MetadataIndex { // Entity ENTITY_FLAGS, @@ -653,7 +653,7 @@ void cProtocol_1_11_0::HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer) void cProtocol_1_11_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_Entity) { - using namespace Metadata; + using namespace Metadata_1_11; // Common metadata: Int8 Flags = 0; @@ -860,7 +860,7 @@ void cProtocol_1_11_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mob) { - using namespace Metadata; + using namespace Metadata_1_11; // Living Enitiy Metadata if (a_Mob.HasCustomName()) -- cgit v1.2.3