Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: old protocol wrong bytes and opentelemetry-cpp lib #2233

Merged
merged 1 commit into from
Feb 14, 2024
Merged

fix: old protocol wrong bytes and opentelemetry-cpp lib #2233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/server/network/protocol/protocolgame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4133,15 +4133,21 @@ void ProtocolGame::sendTextMessage(const TextMessage &message) {
}
case MESSAGE_HEALED:
case MESSAGE_HEALED_OTHERS: {
msg.addPosition(message.position);
msg.add<uint32_t>(message.primary.value);
msg.addByte(message.primary.color);
if (!oldProtocol) {
msg.addPosition(message.position);
msg.add<uint32_t>(message.primary.value);
msg.addByte(message.primary.color);
}
break;
}
case MESSAGE_EXPERIENCE:
case MESSAGE_EXPERIENCE_OTHERS: {
msg.addPosition(message.position);
msg.add<uint64_t>(message.primary.value);
if (!oldProtocol) {
msg.add<uint64_t>(message.primary.value);
} else {
msg.add<uint32_t>(message.primary.value);
}
msg.addByte(message.primary.color);
break;
}
Expand Down
6 changes: 3 additions & 3 deletions vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"name": "opentelemetry-cpp",
"default-features": true,
"features": ["otlp-http", "prometheus"]
"features": [ "otlp-http", "prometheus" ]
},
"parallel-hashmap",
"protobuf",
Expand All @@ -25,7 +25,7 @@
"zlib",
{
"name": "libmariadb",
"features": ["mariadbclient"]
"features": [ "mariadbclient" ]
},
{
"name": "gmp",
Expand All @@ -36,5 +36,5 @@
"platform": "windows"
}
],
"builtin-baseline": "98a562a04cd03728f399e79e1b37bcccb5a69b37"
"builtin-baseline": "095ee06e7f60dceef7d713e3f8b1c2eb10d650d7"
}
Loading