aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/VillagerGolem.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/VillagerGolem.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/VillagerGolem.cpp')
-rw-r--r--Minecraft.World/VillagerGolem.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/Minecraft.World/VillagerGolem.cpp b/Minecraft.World/VillagerGolem.cpp
index dba80ffa..09508bfc 100644
--- a/Minecraft.World/VillagerGolem.cpp
+++ b/Minecraft.World/VillagerGolem.cpp
@@ -53,7 +53,7 @@ VillagerGolem::VillagerGolem(Level *level) : Golem(level)
void VillagerGolem::defineSynchedData()
{
Golem::defineSynchedData();
- entityData->define(DATA_FLAGS_ID, (byte) 0);
+ entityData->define(DATA_FLAGS_ID, static_cast<byte>(0));
}
bool VillagerGolem::useNewAi()
@@ -68,11 +68,11 @@ void VillagerGolem::serverAiMobStep()
villageUpdateInterval = 70 + random->nextInt(50);
shared_ptr<Village> _village = level->villages->getClosestVillage(Mth::floor(x), Mth::floor(y), Mth::floor(z), Villages::MaxDoorDist);
village = _village;
- if (_village == NULL) clearRestriction();
+ if (_village == nullptr) clearRestriction();
else
{
Pos *center = _village->getCenter();
- restrictTo(center->x, center->y, center->z, (int)((float)_village->getRadius()) * 0.6f);
+ restrictTo(center->x, center->y, center->z, static_cast<int>((float)_village->getRadius()) * 0.6f);
}
}
@@ -234,17 +234,17 @@ void VillagerGolem::setPlayerCreated(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));
}
}
void VillagerGolem::die(DamageSource *source)
{
- if (!isPlayerCreated() && lastHurtByPlayer != NULL && village.lock() != NULL)
+ if (!isPlayerCreated() && lastHurtByPlayer != nullptr && village.lock() != nullptr)
{
village.lock()->modifyStanding(lastHurtByPlayer->getName(), -5);
}
@@ -257,7 +257,7 @@ bool VillagerGolem::hurt(DamageSource *source, float dmg)
if (isPlayerCreated())
{
shared_ptr<Entity> entity = source->getDirectEntity();
- if (entity != NULL && entity->instanceof(eTYPE_PLAYER))
+ if (entity != nullptr && entity->instanceof(eTYPE_PLAYER))
{
shared_ptr<Player> player = dynamic_pointer_cast<Player>(entity);
if (!player->isAllowedToAttackPlayers()) return false;