Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Minecraft.World/Witch.cpp
View File

@@ -43,7 +43,7 @@ void Witch::defineSynchedData()
{
Monster::defineSynchedData();
getEntityData()->define(DATA_USING_ITEM, static_cast<byte>(0));
getEntityData()->define(DATA_USING_ITEM, (byte) 0);
}
int Witch::getAmbientSound()
@@ -63,7 +63,7 @@ int Witch::getDeathSound()
void Witch::setUsingItem(bool isUsing)
{
getEntityData()->set(DATA_USING_ITEM, isUsing ? static_cast<byte>(1) : static_cast<byte>(0));
getEntityData()->set(DATA_USING_ITEM, isUsing ? (byte) 1 : (byte) 0);
}
bool Witch::isUsingItem()
@@ -96,10 +96,10 @@ void Witch::aiStep()
shared_ptr<ItemInstance> item = getCarriedItem();
setEquippedSlot(SLOT_WEAPON, nullptr);
if (item != nullptr && item->id == Item::potion_Id)
if (item != NULL && item->id == Item::potion_Id)
{
vector<MobEffectInstance *> *effects = Item::potion->getMobEffects(item);
if (effects != nullptr)
if (effects != NULL)
{
for(auto& effect : *effects)
{
@@ -124,18 +124,18 @@ void Witch::aiStep()
{
potion = PotionBrewing::POTION_ID_HEAL;
}
else if (random->nextFloat() < 0.25f && getTarget() != nullptr && !hasEffect(MobEffect::movementSpeed) && getTarget()->distanceToSqr(shared_from_this()) > 11 * 11)
else if (random->nextFloat() < 0.25f && getTarget() != NULL && !hasEffect(MobEffect::movementSpeed) && getTarget()->distanceToSqr(shared_from_this()) > 11 * 11)
{
potion = PotionBrewing::POTION_ID_SWIFTNESS;
}
else if (random->nextFloat() < 0.25f && getTarget() != nullptr && !hasEffect(MobEffect::movementSpeed) && getTarget()->distanceToSqr(shared_from_this()) > 11 * 11)
else if (random->nextFloat() < 0.25f && getTarget() != NULL && !hasEffect(MobEffect::movementSpeed) && getTarget()->distanceToSqr(shared_from_this()) > 11 * 11)
{
potion = PotionBrewing::POTION_ID_SWIFTNESS;
}
if (potion > -1)
{
setEquippedSlot(SLOT_WEAPON, std::make_shared<ItemInstance>(Item::potion, 1, potion));
setEquippedSlot(SLOT_WEAPON, shared_ptr<ItemInstance>( new ItemInstance(Item::potion, 1, potion)) );
usingTime = getCarriedItem()->getUseDuration();
setUsingItem(true);
AttributeInstance *speed = getAttribute(SharedMonsterAttributes::MOVEMENT_SPEED);
@@ -198,7 +198,7 @@ void Witch::performRangedAttack(shared_ptr<LivingEntity> target, float power)
{
if (isUsingItem()) return;
shared_ptr<ThrownPotion> potion = std::make_shared<ThrownPotion>(level, dynamic_pointer_cast<LivingEntity>(shared_from_this()), PotionBrewing::POTION_ID_SPLASH_DAMAGE);
shared_ptr<ThrownPotion> potion = shared_ptr<ThrownPotion>( new ThrownPotion(level, dynamic_pointer_cast<LivingEntity>(shared_from_this()), PotionBrewing::POTION_ID_SPLASH_DAMAGE) );
potion->xRot -= -20;
double xd = (target->x + target->xd) - x;
double yd = (target->y + target->getHeadHeight() - 1.1f) - y;