Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion modules/game_cyclopedia/tab/charms/charms.lua
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,9 @@ function Cyclopedia.loadCharms(charmsData)
end
local CharmList = isModernUI and UI.mainPanelCharmsType.panelCharmList.CharmList or UI.CharmList
local player = g_game.getLocalPlayer()

if not CharmList then
return
end
if isModernUI then
local formatResourceBalance = function(resourceType, maxResourceType)
return string.format("%d/%d", player:getResourceBalance(resourceType),
Expand Down
6 changes: 4 additions & 2 deletions src/client/protocolgameparse.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4103,8 +4103,10 @@ void ProtocolGame::parseShowDescription(const InputMessagePtr& msg)

void ProtocolGame::parseBestiaryTracker(const InputMessagePtr& msg)
{
const uint8_t trackerType = msg->getU8(); // 0x00 para bestiary, 0x01 para boss

uint8_t trackerType = 0;
if (g_game.getClientVersion() >= 1320) {
trackerType = msg->getU8(); // 0x00 for bestiary, 0x01 for boss
}
const uint8_t size = msg->getU8();
std::vector<std::tuple<uint16_t, uint32_t, uint16_t, uint16_t, uint16_t, uint8_t>> trackerData;

Expand Down
Loading