flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Add player statistics to API (#5193)

Browse Source 
* Fixed issue #5166

Co-authored-by: 12xx12 <44411062+12xx12@users.noreply.github.com>
Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
This commit is contained in:
nshah25
2021-05-03 16:07:09 -04:00
committed by GitHub
parent 626f8b2350
commit 8be1dd54bb
56 changed files with 1408 additions and 1002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BlockEntities/BeaconEntity.cpp
View File

@@ -206,7 +206,7 @@ void cBeaconEntity::UpdateBeacon(void)
(std::abs(Distance.z) <= 20)
)
{
a_Player.AwardAchievement(Statistic::AchFullBeacon);
a_Player.AwardAchievement(CustomStatistic::AchFullBeacon);
}
return false;
}
@@ -313,7 +313,7 @@ bool cBeaconEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
bool cBeaconEntity::UsedBy(cPlayer * a_Player)
{
a_Player->GetStatManager().AddValue(Statistic::InteractWithBeacon);
a_Player->GetStatistics().Custom[CustomStatistic::InteractWithBeacon]++;
cWindow * Window = GetWindow();
if (Window == nullptr)

2
src/BlockEntities/BrewingstandEntity.cpp
View File

@@ -145,7 +145,7 @@ bool cBrewingstandEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
bool cBrewingstandEntity::UsedBy(cPlayer * a_Player)
{
a_Player->GetStatManager().AddValue(Statistic::InteractWithBrewingstand);
a_Player->GetStatistics().Custom[CustomStatistic::InteractWithBrewingstand]++;
cWindow * Window = GetWindow();
if (Window == nullptr)

4
src/BlockEntities/ChestEntity.cpp
View File

@@ -204,11 +204,11 @@ bool cChestEntity::UsedBy(cPlayer * a_Player)
if (m_BlockType == E_BLOCK_CHEST)
{
a_Player->GetStatManager().AddValue(Statistic::OpenChest);
a_Player->GetStatistics().Custom[CustomStatistic::OpenChest]++;
}
else // E_BLOCK_TRAPPED_CHEST
{
a_Player->GetStatManager().AddValue(Statistic::TriggerTrappedChest);
a_Player->GetStatistics().Custom[CustomStatistic::TriggerTrappedChest]++;
}
auto & PrimaryChest = GetPrimaryChest();

4
src/BlockEntities/DropSpenserEntity.cpp
View File

@@ -163,11 +163,11 @@ bool cDropSpenserEntity::UsedBy(cPlayer * a_Player)
{
if (m_BlockType == E_BLOCK_DISPENSER)
{
a_Player->GetStatManager().AddValue(Statistic::InspectDispenser);
a_Player->GetStatistics().Custom[CustomStatistic::InspectDispenser]++;
}
else // E_BLOCK_DROPPER
{
a_Player->GetStatManager().AddValue(Statistic::InspectDropper);
a_Player->GetStatistics().Custom[CustomStatistic::InspectDropper]++;
}
cWindow * Window = GetWindow();

2
src/BlockEntities/EnderChestEntity.cpp
View File

@@ -62,7 +62,7 @@ bool cEnderChestEntity::UsedBy(cPlayer * a_Player)
return false;
}
a_Player->GetStatManager().AddValue(Statistic::OpenEnderchest);
a_Player->GetStatistics().Custom[CustomStatistic::OpenEnderchest]++;
// If the window is not created, open it anew:
cWindow * Window = GetWindow();

2
src/BlockEntities/FlowerPotEntity.cpp
View File

@@ -50,7 +50,7 @@ bool cFlowerPotEntity::UsedBy(cPlayer * a_Player)
return false;
}
a_Player->GetStatManager().AddValue(Statistic::PotFlower);
a_Player->GetStatistics().Custom[CustomStatistic::PotFlower]++;
cItem SelectedItem = a_Player->GetInventory().GetEquippedItem();
if (IsFlower(SelectedItem.m_ItemType, SelectedItem.m_ItemDamage))

2
src/BlockEntities/FurnaceEntity.cpp
View File

@@ -127,7 +127,7 @@ bool cFurnaceEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
bool cFurnaceEntity::UsedBy(cPlayer * a_Player)
{
a_Player->GetStatManager().AddValue(Statistic::InteractWithFurnace);
a_Player->GetStatistics().Custom[CustomStatistic::InteractWithFurnace]++;
cWindow * Window = GetWindow();
if (Window == nullptr)

2
src/BlockEntities/HopperEntity.cpp
View File

@@ -113,7 +113,7 @@ void cHopperEntity::SendTo(cClientHandle & a_Client)
bool cHopperEntity::UsedBy(cPlayer * a_Player)
{
a_Player->GetStatManager().AddValue(Statistic::InspectHopper);
a_Player->GetStatistics().Custom[CustomStatistic::InspectHopper]++;
// If the window is not created, open it anew:
cWindow * Window = GetWindow();

3
src/BlockEntities/JukeboxEntity.cpp
View File

@@ -65,7 +65,8 @@ bool cJukeboxEntity::UsedBy(cPlayer * a_Player)
const cItem & HeldItem = a_Player->GetEquippedItem();
if (PlayRecord(HeldItem.m_ItemType))
{
a_Player->GetStatManager().AddValue(Statistic::PlayRecord);
a_Player->GetStatistics().Custom[CustomStatistic::PlayRecord]++;
if (!a_Player->IsGameModeCreative())
{
a_Player->GetInventory().RemoveOneEquippedItem();

2
src/BlockEntities/NoteEntity.cpp
View File

@@ -34,7 +34,7 @@ void cNoteEntity::CopyFrom(const cBlockEntity & a_Src)
bool cNoteEntity::UsedBy(cPlayer * a_Player)
{
a_Player->GetStatManager().AddValue(Statistic::TuneNoteblock);
a_Player->GetStatistics().Custom[CustomStatistic::TuneNoteblock]++;
IncrementNote();
MakeSound();
return true;