mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-07-12 19:58:25 +00:00
TU19: merge Minecraft.World/Entities
This commit is contained in:
@@ -4,36 +4,58 @@
|
||||
#include "../Headers/net.minecraft.world.damagesource.h"
|
||||
#include "../Headers/net.minecraft.network.packet.h"
|
||||
|
||||
// EntityDamageSource::EntityDamageSource(const std::wstring &msgId,
|
||||
// std::shared_ptr<Entity> entity) : DamageSource(msgId)
|
||||
EntityDamageSource::EntityDamageSource(ChatPacket::EChatPacketMessage msgId,
|
||||
std::shared_ptr<Entity> entity)
|
||||
: DamageSource(msgId) {
|
||||
// EntityDamageSource::EntityDamageSource(const wstring &msgId,
|
||||
// shared_ptr<Entity> entity) : DamageSource(msgId)
|
||||
EntityDamageSource::EntityDamageSource(
|
||||
ChatPacket::EChatPacketMessage msgId,
|
||||
ChatPacket::EChatPacketMessage msgWithItemId,
|
||||
std::shared_ptr<Entity> entity)
|
||||
: DamageSource(msgId, msgWithItemId) {
|
||||
this->entity = entity;
|
||||
}
|
||||
|
||||
std::shared_ptr<Entity> EntityDamageSource::getEntity() { return entity; }
|
||||
|
||||
// std::wstring
|
||||
// EntityDamageSource::getLocalizedDeathMessage(std::shared_ptr<Player> player)
|
||||
// wstring EntityDamageSource::getLocalizedDeathMessage(shared_ptr<Player>
|
||||
// player)
|
||||
//{
|
||||
// return L"death." + msgId + player->name + entity->getAName();
|
||||
// //return I18n.get("death." + msgId, player.name, entity.getAName());
|
||||
// }
|
||||
|
||||
std::shared_ptr<ChatPacket> EntityDamageSource::getDeathMessagePacket(
|
||||
std::shared_ptr<Player> player) {
|
||||
std::shared_ptr<LivingEntity> player) {
|
||||
std::shared_ptr<ItemInstance> held =
|
||||
(entity != NULL) && entity->instanceof(eTYPE_LIVINGENTITY)
|
||||
? std::dynamic_pointer_cast<LivingEntity>(entity)->getCarriedItem()
|
||||
: nullptr;
|
||||
std::wstring additional = L"";
|
||||
if (entity->GetType() == eTYPE_SERVERPLAYER) {
|
||||
std::shared_ptr<Player> sourcePlayer =
|
||||
std::dynamic_pointer_cast<Player>(entity);
|
||||
if (sourcePlayer != NULL) additional = sourcePlayer->name;
|
||||
|
||||
if (entity->instanceof(eTYPE_SERVERPLAYER)) {
|
||||
additional = std::dynamic_pointer_cast<Player>(entity)->name;
|
||||
} else if (entity->instanceof(eTYPE_MOB)) {
|
||||
std::shared_ptr<Mob> mob = std::dynamic_pointer_cast<Mob>(entity);
|
||||
if (mob->hasCustomName()) {
|
||||
additional = mob->getCustomName();
|
||||
}
|
||||
}
|
||||
|
||||
if ((held != NULL) && held->hasCustomHoverName()) {
|
||||
return std::shared_ptr<ChatPacket>(new ChatPacket(
|
||||
player->getNetworkName(), m_msgWithItemId, entity->GetType(),
|
||||
additional, held->getHoverName()));
|
||||
} else {
|
||||
return std::shared_ptr<ChatPacket>(new ChatPacket(
|
||||
player->getNetworkName(), m_msgId, entity->GetType(), additional));
|
||||
}
|
||||
return std::shared_ptr<ChatPacket>(
|
||||
new ChatPacket(player->name, m_msgId, entity->GetType(), additional));
|
||||
}
|
||||
|
||||
bool EntityDamageSource::scalesWithDifficulty() {
|
||||
return entity != NULL && std::dynamic_pointer_cast<Mob>(entity) &&
|
||||
!(std::dynamic_pointer_cast<Player>(entity));
|
||||
return (entity != NULL) && entity->instanceof(eTYPE_LIVINGENTITY) &&
|
||||
!entity->instanceof(eTYPE_PLAYER);
|
||||
}
|
||||
|
||||
// 4J: Copy function
|
||||
DamageSource* EntityDamageSource::copy() {
|
||||
return new EntityDamageSource(*this);
|
||||
}
|
||||
Reference in New Issue
Block a user