From 5d0c6f4d6c28845cd00da0925a50af770516227d Mon Sep 17 00:00:00 2001 From: Eduardo Dantas Date: Wed, 14 Feb 2024 17:33:40 -0300 Subject: [PATCH] fix: old protocol wrong bytes and opentelemetry-cpp lib --- src/server/network/protocol/protocolgame.cpp | 14 ++++++++++---- vcpkg.json | 6 +++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp index 2492d800cea..30daf2c1bad 100644 --- a/src/server/network/protocol/protocolgame.cpp +++ b/src/server/network/protocol/protocolgame.cpp @@ -4133,15 +4133,21 @@ void ProtocolGame::sendTextMessage(const TextMessage &message) { } case MESSAGE_HEALED: case MESSAGE_HEALED_OTHERS: { - msg.addPosition(message.position); - msg.add(message.primary.value); - msg.addByte(message.primary.color); + if (!oldProtocol) { + msg.addPosition(message.position); + msg.add(message.primary.value); + msg.addByte(message.primary.color); + } break; } case MESSAGE_EXPERIENCE: case MESSAGE_EXPERIENCE_OTHERS: { msg.addPosition(message.position); - msg.add(message.primary.value); + if (!oldProtocol) { + msg.add(message.primary.value); + } else { + msg.add(message.primary.value); + } msg.addByte(message.primary.color); break; } diff --git a/vcpkg.json b/vcpkg.json index 7201d4a5556..50222f7e5bf 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -16,7 +16,7 @@ { "name": "opentelemetry-cpp", "default-features": true, - "features": ["otlp-http", "prometheus"] + "features": [ "otlp-http", "prometheus" ] }, "parallel-hashmap", "protobuf", @@ -25,7 +25,7 @@ "zlib", { "name": "libmariadb", - "features": ["mariadbclient"] + "features": [ "mariadbclient" ] }, { "name": "gmp", @@ -36,5 +36,5 @@ "platform": "windows" } ], - "builtin-baseline": "98a562a04cd03728f399e79e1b37bcccb5a69b37" + "builtin-baseline": "095ee06e7f60dceef7d713e3f8b1c2eb10d650d7" }