a9be52c41a
* 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
71 lines
1.4 KiB
C++
71 lines
1.4 KiB
C++
#include "stdafx.h"
|
|
#include "net.minecraft.world.damagesource.h"
|
|
#include "net.minecraft.world.entity.h"
|
|
#include "BasicTypeContainers.h"
|
|
#include "CombatEntry.h"
|
|
|
|
CombatEntry::CombatEntry(DamageSource *source, int time, float health, float damage, CombatTracker::eLOCATION location, float fallDistance)
|
|
{
|
|
this->source = nullptr;
|
|
if(source != nullptr)
|
|
{
|
|
// 4J: this might actually be a derived damage source so use copy func
|
|
this->source = source->copy();
|
|
}
|
|
this->time = time;
|
|
this->damage = damage;
|
|
this->health = health;
|
|
this->location = location;
|
|
this->fallDistance = fallDistance;
|
|
}
|
|
|
|
CombatEntry::~CombatEntry()
|
|
{
|
|
delete source;
|
|
}
|
|
|
|
DamageSource *CombatEntry::getSource()
|
|
{
|
|
return source;
|
|
}
|
|
|
|
int CombatEntry::getTime()
|
|
{
|
|
return time;
|
|
}
|
|
|
|
float CombatEntry::getDamage()
|
|
{
|
|
return damage;
|
|
}
|
|
|
|
float CombatEntry::getHealthBeforeDamage()
|
|
{
|
|
return health;
|
|
}
|
|
|
|
float CombatEntry::getHealthAfterDamage()
|
|
{
|
|
return health - damage;
|
|
}
|
|
|
|
bool CombatEntry::isCombatRelated()
|
|
{
|
|
return source->getEntity() && source->getEntity()->instanceof(eTYPE_LIVINGENTITY);
|
|
}
|
|
|
|
CombatTracker::eLOCATION CombatEntry::getLocation()
|
|
{
|
|
return location;
|
|
}
|
|
|
|
wstring CombatEntry::getAttackerName()
|
|
{
|
|
return getSource()->getEntity() == nullptr ? L"" : getSource()->getEntity()->getNetworkName();
|
|
}
|
|
|
|
float CombatEntry::getFallDistance()
|
|
{
|
|
if (source == DamageSource::outOfWorld) return Float::MAX_VALUE;
|
|
return fallDistance;
|
|
} |