aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/TamableAnimal.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.World/TamableAnimal.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.World/TamableAnimal.cpp')
-rw-r--r--Minecraft.World/TamableAnimal.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/Minecraft.World/TamableAnimal.cpp b/Minecraft.World/TamableAnimal.cpp
index 2a3ea037..1fb41df3 100644
--- a/Minecraft.World/TamableAnimal.cpp
+++ b/Minecraft.World/TamableAnimal.cpp
@@ -13,13 +13,13 @@ TamableAnimal::TamableAnimal(Level *level) : Animal(level)
TamableAnimal::~TamableAnimal()
{
- if(sitGoal != NULL) delete sitGoal;
+ if(sitGoal != nullptr) delete sitGoal;
}
void TamableAnimal::defineSynchedData()
{
Animal::defineSynchedData();
- entityData->define(DATA_FLAGS_ID, (byte) 0);
+ entityData->define(DATA_FLAGS_ID, static_cast<byte>(0));
entityData->define(DATA_OWNERUUID_ID, L"");
}
@@ -113,11 +113,11 @@ void TamableAnimal::setTame(bool value)
byte current = entityData->getByte(DATA_FLAGS_ID);
if (value)
{
- entityData->set(DATA_FLAGS_ID, (byte) (current | 0x04));
+ entityData->set(DATA_FLAGS_ID, static_cast<byte>(current | 0x04));
}
else
{
- entityData->set(DATA_FLAGS_ID, (byte) (current & ~0x04));
+ entityData->set(DATA_FLAGS_ID, static_cast<byte>(current & ~0x04));
}
}
@@ -131,11 +131,11 @@ void TamableAnimal::setSitting(bool value)
byte current = entityData->getByte(DATA_FLAGS_ID);
if (value)
{
- entityData->set(DATA_FLAGS_ID, (byte) (current | 0x01));
+ entityData->set(DATA_FLAGS_ID, static_cast<byte>(current | 0x01));
}
else
{
- entityData->set(DATA_FLAGS_ID, (byte) (current & ~0x01));
+ entityData->set(DATA_FLAGS_ID, static_cast<byte>(current & ~0x01));
}
}
@@ -169,7 +169,7 @@ Team *TamableAnimal::getTeam()
if (isTame())
{
shared_ptr<LivingEntity> owner = dynamic_pointer_cast<LivingEntity>(getOwner());
- if (owner != NULL)
+ if (owner != nullptr)
{
return owner->getTeam();
}
@@ -186,7 +186,7 @@ bool TamableAnimal::isAlliedTo(shared_ptr<LivingEntity> other)
{
return true;
}
- if (owner != NULL)
+ if (owner != nullptr)
{
return owner->isAlliedTo(other);
}