aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/ServerScoreboard.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.Client/ServerScoreboard.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides * Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.Client/ServerScoreboard.cpp')
-rw-r--r--Minecraft.Client/ServerScoreboard.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.Client/ServerScoreboard.cpp b/Minecraft.Client/ServerScoreboard.cpp
index 738a29c9..9a044324 100644
--- a/Minecraft.Client/ServerScoreboard.cpp
+++ b/Minecraft.Client/ServerScoreboard.cpp
@@ -37,7 +37,7 @@ void ServerScoreboard::setDisplayObjective(int slot, Objective *objective)
//Scoreboard::setDisplayObjective(slot, objective);
- //if (old != objective && old != NULL)
+ //if (old != objective && old != nullptr)
//{
// if (getObjectiveDisplaySlotCount(old) > 0)
// {
@@ -49,7 +49,7 @@ void ServerScoreboard::setDisplayObjective(int slot, Objective *objective)
// }
//}
- //if (objective != NULL)
+ //if (objective != nullptr)
//{
// if (trackedObjectives.contains(objective))
// {
@@ -146,7 +146,7 @@ void ServerScoreboard::setSaveData(ScoreboardSaveData *data)
void ServerScoreboard::setDirty()
{
- //if (saveData != NULL)
+ //if (saveData != nullptr)
//{
// saveData->setDirty();
//}
@@ -154,7 +154,7 @@ void ServerScoreboard::setDirty()
vector<shared_ptr<Packet> > *ServerScoreboard::getStartTrackingPackets(Objective *objective)
{
- return NULL;
+ return nullptr;
//vector<shared_ptr<Packet> > *packets = new vector<shared_ptr<Packet> >();
//packets.push_back( shared_ptr<SetObjectivePacket>( new SetObjectivePacket(objective, SetObjectivePacket::METHOD_ADD)));
@@ -189,7 +189,7 @@ void ServerScoreboard::startTrackingObjective(Objective *objective)
vector<shared_ptr<Packet> > *ServerScoreboard::getStopTrackingPackets(Objective *objective)
{
- return NULL;
+ return nullptr;
//vector<shared_ptr<Packet> > *packets = new ArrayList<Packet>();
//packets->push_back( shared_ptr<SetObjectivePacket( new SetObjectivePacket(objective, SetObjectivePacket.METHOD_REMOVE)));