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_12.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Protocol/Protocol_1_12.cpp') diff --git a/src/Protocol/Protocol_1_12.cpp b/src/Protocol/Protocol_1_12.cpp index 8cf8df6ca..d2e7b2071 100644 --- a/src/Protocol/Protocol_1_12.cpp +++ b/src/Protocol/Protocol_1_12.cpp @@ -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()) -- cgit v1.2.3