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
62 lines
2.0 KiB
C++
62 lines
2.0 KiB
C++
#include "stdafx.h"
|
|
#include "net.minecraft.world.entity.player.h"
|
|
#include "net.minecraft.world.entity.h"
|
|
#include "net.minecraft.world.damagesource.h"
|
|
#include "net.minecraft.network.packet.h"
|
|
|
|
//IndirectEntityDamageSource::IndirectEntityDamageSource(const wstring &msgId, shared_ptr<Entity> entity, shared_ptr<Entity> owner) : EntityDamageSource(msgId, entity)
|
|
IndirectEntityDamageSource::IndirectEntityDamageSource(ChatPacket::EChatPacketMessage msgId, ChatPacket::EChatPacketMessage msgWithItemId, shared_ptr<Entity> entity, shared_ptr<Entity> owner) : EntityDamageSource(msgId, msgWithItemId, entity)
|
|
{
|
|
this->owner = owner;
|
|
}
|
|
|
|
// 4J Stu - Brought forward from 1.2.3 to fix #46422
|
|
shared_ptr<Entity> IndirectEntityDamageSource::getDirectEntity()
|
|
{
|
|
return entity;
|
|
}
|
|
|
|
shared_ptr<Entity> IndirectEntityDamageSource::getEntity()
|
|
{
|
|
return owner;
|
|
}
|
|
|
|
//wstring IndirectEntityDamageSource::getLocalizedDeathMessage(shared_ptr<Player> player)
|
|
//{
|
|
// return L"death." + msgId + player->name + owner->getAName();
|
|
// //return I18n.get("death." + msgId, player.name, owner.getAName());
|
|
//}
|
|
|
|
shared_ptr<ChatPacket> IndirectEntityDamageSource::getDeathMessagePacket(shared_ptr<LivingEntity> player)
|
|
{
|
|
shared_ptr<ItemInstance> held = entity->instanceof(eTYPE_LIVINGENTITY) ? dynamic_pointer_cast<LivingEntity>(entity)->getCarriedItem() : nullptr;
|
|
wstring additional = L"";
|
|
int type;
|
|
if(owner != nullptr)
|
|
{
|
|
type = owner->GetType();
|
|
if(type == eTYPE_SERVERPLAYER)
|
|
{
|
|
shared_ptr<Player> sourcePlayer = dynamic_pointer_cast<Player>(owner);
|
|
if(sourcePlayer != nullptr) additional = sourcePlayer->name;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
type = entity->GetType();
|
|
}
|
|
if(held != nullptr && held->hasCustomHoverName() )
|
|
{
|
|
return std::make_shared<ChatPacket>(player->getNetworkName(), m_msgWithItemId, type, additional, held->getHoverName());
|
|
}
|
|
else
|
|
{
|
|
return std::make_shared<ChatPacket>(player->getNetworkName(), m_msgId, type, additional);
|
|
}
|
|
}
|
|
|
|
// 4J: Copy function
|
|
DamageSource *IndirectEntityDamageSource::copy()
|
|
{
|
|
return new IndirectEntityDamageSource(*this);
|
|
} |