From a5953595c350a97fedfd43d9c7e30a354b81daf8 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Tue, 20 Nov 2018 06:26:04 +1100 Subject: [PATCH] Fix skins not working in non-CPE --- src/PacketHandlers.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/PacketHandlers.c b/src/PacketHandlers.c index 167254cc0..60ae1c3bf 100644 --- a/src/PacketHandlers.c +++ b/src/PacketHandlers.c @@ -139,17 +139,17 @@ static void Handlers_RemoveTablistEntry(EntityID id) { static void Handlers_CheckName(EntityID id, String* name, String* skin) { String colorlessName; char colorlessBuffer[STRING_SIZE]; - String_StripCols(skin); Handlers_RemoveEndPlus(name); - Handlers_RemoveEndPlus(skin); /* Server is only allowed to change our own name colours. */ - if (id != ENTITIES_SELF_ID) return; + if (id == ENTITIES_SELF_ID) { + String_InitArray(colorlessName, colorlessBuffer); + String_AppendColorless(&colorlessName, name); + if (!String_Equals(&colorlessName, &Game_Username)) String_Copy(name, &Game_Username); + } - String_InitArray(colorlessName, colorlessBuffer); - String_AppendColorless(&colorlessName, name); - - if (!String_Equals(&colorlessName, &Game_Username)) String_Copy(name, &Game_Username); - if (!skin->length) String_Copy(skin, &Game_Username); + if (!skin->length) String_Copy(skin, name); + Handlers_RemoveEndPlus(skin); + String_StripCols(skin); } static void Classic_ReadAbsoluteLocation(uint8_t* data, EntityID id, bool interpolate);