LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-25 00:45:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: format Minecraft.World

Browse Source
This commit is contained in:
Tropical
2026-03-13 17:06:56 -05:00
parent bd6284025d
commit 33d0737d1d
1511 changed files with 108661 additions and 115521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
Minecraft.World/Entities/Monster.cpp
View File

@@ -9,66 +9,55 @@
#include "Monster.h"
#include "../../Minecraft.Client/Minecraft.h"
void Monster::_init() { attackDamage = 2; }
Monster::Monster(Level* level) : PathfinderMob(level) {
// 4J Stu - This function call had to be moved here from the Entity ctor to
// ensure that the derived version of the function is called
void Monster::_init()
{
attackDamage = 2;
}
Monster::Monster(Level *level) : PathfinderMob( level )
{
// 4J Stu - This function call had to be moved here from the Entity ctor to ensure that
// the derived version of the function is called
// 4J Stu - Only the most derived classes should call this
//this->defineSynchedData();
// 4J Stu - Only the most derived classes should call this
// this->defineSynchedData();
_init();
xpReward = Enemy::XP_REWARD_MEDIUM;
xpReward = Enemy::XP_REWARD_MEDIUM;
}
void Monster::aiStep()
{
void Monster::aiStep() {
float br = getBrightness(1);
if (br > 0.5f)
{
if (br > 0.5f) {
noActionTime += 2;
}
PathfinderMob::aiStep();
}
void Monster::tick()
{
void Monster::tick() {
PathfinderMob::tick();
if (!level->isClientSide && (level->difficulty == Difficulty::PEACEFUL || Minecraft::GetInstance()->isTutorial() ) ) remove();
if (!level->isClientSide && (level->difficulty == Difficulty::PEACEFUL ||
Minecraft::GetInstance()->isTutorial()))
remove();
}
std::shared_ptr<Entity> Monster::findAttackTarget()
{
std::shared_ptr<Entity> Monster::findAttackTarget() {
#ifndef _FINAL_BUILD
if(app.GetMobsDontAttackEnabled())
{
return std::shared_ptr<Player>();
}
if (app.GetMobsDontAttackEnabled()) {
return std::shared_ptr<Player>();
}
#endif
std::shared_ptr<Player> player = level->getNearestAttackablePlayer(shared_from_this(), 16);
if (player != NULL && canSee(player) ) return player;
std::shared_ptr<Player> player =
level->getNearestAttackablePlayer(shared_from_this(), 16);
if (player != NULL && canSee(player)) return player;
return std::shared_ptr<Player>();
}
bool Monster::hurt(DamageSource *source, int dmg)
{
if (PathfinderMob::hurt(source, dmg))
{
std::shared_ptr<Entity> sourceEntity = source->getEntity();
bool Monster::hurt(DamageSource* source, int dmg) {
if (PathfinderMob::hurt(source, dmg)) {
std::shared_ptr<Entity> sourceEntity = source->getEntity();
if (rider.lock() == sourceEntity || riding == sourceEntity) return true;
if (sourceEntity != shared_from_this())
{
if (sourceEntity != shared_from_this()) {
this->attackTarget = sourceEntity;
}
return true;
@@ -77,70 +66,64 @@ bool Monster::hurt(DamageSource *source, int dmg)
}
/**
* Performs hurt action, returns if successful
*
* @param target
* @return
*/
bool Monster::doHurtTarget(std::shared_ptr<Entity> target)
{
int dmg = attackDamage;
if (hasEffect(MobEffect::damageBoost))
{
dmg += (3 << getEffect(MobEffect::damageBoost)->getAmplifier());
}
if (hasEffect(MobEffect::weakness))
{
dmg -= (2 << getEffect(MobEffect::weakness)->getAmplifier());
}
* Performs hurt action, returns if successful
*
* @param target
* @return
*/
bool Monster::doHurtTarget(std::shared_ptr<Entity> target) {
int dmg = attackDamage;
if (hasEffect(MobEffect::damageBoost)) {
dmg += (3 << getEffect(MobEffect::damageBoost)->getAmplifier());
}
if (hasEffect(MobEffect::weakness)) {
dmg -= (2 << getEffect(MobEffect::weakness)->getAmplifier());
}
DamageSource *damageSource = DamageSource::mobAttack(std::dynamic_pointer_cast<Mob>( shared_from_this() ) );
bool didHurt = target->hurt(damageSource, dmg);
delete damageSource;
DamageSource* damageSource = DamageSource::mobAttack(
std::dynamic_pointer_cast<Mob>(shared_from_this()));
bool didHurt = target->hurt(damageSource, dmg);
delete damageSource;
if (didHurt)
{
int fireAspect = EnchantmentHelper::getFireAspect(std::dynamic_pointer_cast<Mob>(shared_from_this()));
if (fireAspect > 0)
{
target->setOnFire(fireAspect * 4);
}
if (didHurt) {
int fireAspect = EnchantmentHelper::getFireAspect(
std::dynamic_pointer_cast<Mob>(shared_from_this()));
if (fireAspect > 0) {
target->setOnFire(fireAspect * 4);
}
std::shared_ptr<Mob> mob = std::dynamic_pointer_cast<Mob>(target);
if (mob != NULL)
{
ThornsEnchantment::doThornsAfterAttack(shared_from_this(), mob, random);
}
}
std::shared_ptr<Mob> mob = std::dynamic_pointer_cast<Mob>(target);
if (mob != NULL) {
ThornsEnchantment::doThornsAfterAttack(shared_from_this(), mob,
random);
}
}
return didHurt;
return didHurt;
}
void Monster::checkHurtTarget(std::shared_ptr<Entity> target, float distance)
{
if (attackTime <= 0 && distance < 2.0f && target->bb->y1 > bb->y0 && target->bb->y0 < bb->y1)
{
void Monster::checkHurtTarget(std::shared_ptr<Entity> target, float distance) {
if (attackTime <= 0 && distance < 2.0f && target->bb->y1 > bb->y0 &&
target->bb->y0 < bb->y1) {
attackTime = 20;
doHurtTarget(target);
}
}
float Monster::getWalkTargetValue(int x, int y, int z)
{
float Monster::getWalkTargetValue(int x, int y, int z) {
return 0.5f - level->getBrightness(x, y, z);
}
bool Monster::isDarkEnoughToSpawn()
{
bool Monster::isDarkEnoughToSpawn() {
int xt = Mth::floor(x);
int yt = Mth::floor(bb->y0);
int zt = Mth::floor(z);
if (level->getBrightness(LightLayer::Sky, xt, yt, zt) > random->nextInt(32)) return false;
if (level->getBrightness(LightLayer::Sky, xt, yt, zt) > random->nextInt(32))
return false;
int br = level->getRawBrightness(xt, yt, zt);
if (level->isThundering())
{
if (level->isThundering()) {
int tmp = level->skyDarken;
level->skyDarken = 10;
br = level->getRawBrightness(xt, yt, zt);
@@ -150,9 +133,10 @@ bool Monster::isDarkEnoughToSpawn()
return br <= random->nextInt(8);
}
bool Monster::canSpawn()
{
// 4J Stu
// Fix for #8265 - AI: Monsters will flash briefly on the screen around Monster Spawners when the game settings are set to Peaceful.
return isDarkEnoughToSpawn() && PathfinderMob::canSpawn() && level->difficulty > Difficulty::PEACEFUL;
bool Monster::canSpawn() {
// 4J Stu
// Fix for #8265 - AI: Monsters will flash briefly on the screen around
// Monster Spawners when the game settings are set to Peaceful.
return isDarkEnoughToSpawn() && PathfinderMob::canSpawn() &&
level->difficulty > Difficulty::PEACEFUL;
}