LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-18 20:38:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

TU19: merge Minecraft.World/Entities

Browse Source
This commit is contained in:
Tropical
2026-03-21 16:29:02 -05:00
parent 405a87e078
commit 3d3fa566c7
178 changed files with 12204 additions and 4256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Minecraft.World/Entities/IndirectEntityDamageSource.cpp
View File

@@ -4,13 +4,14 @@
#include "../Headers/net.minecraft.world.damagesource.h"
#include "../Headers/net.minecraft.network.packet.h"
// IndirectEntityDamageSource::IndirectEntityDamageSource(const std::wstring
// &msgId, std::shared_ptr<Entity> entity, std::shared_ptr<Entity> owner) :
// IndirectEntityDamageSource::IndirectEntityDamageSource(const wstring &msgId,
// shared_ptr<Entity> entity, shared_ptr<Entity> owner) :
// EntityDamageSource(msgId, entity)
IndirectEntityDamageSource::IndirectEntityDamageSource(
ChatPacket::EChatPacketMessage msgId, std::shared_ptr<Entity> entity,
std::shared_ptr<Entity> owner)
: EntityDamageSource(msgId, entity) {
ChatPacket::EChatPacketMessage msgId,
ChatPacket::EChatPacketMessage msgWithItemId,
std::shared_ptr<Entity> entity, std::shared_ptr<Entity> owner)
: EntityDamageSource(msgId, msgWithItemId, entity) {
this->owner = owner;
}
@@ -23,8 +24,8 @@ std::shared_ptr<Entity> IndirectEntityDamageSource::getEntity() {
return owner;
}
// std::wstring
// IndirectEntityDamageSource::getLocalizedDeathMessage(std::shared_ptr<Player>
// wstring
// IndirectEntityDamageSource::getLocalizedDeathMessage(shared_ptr<Player>
// player)
//{
// return L"death." + msgId + player->name + owner->getAName();
@@ -32,7 +33,11 @@ std::shared_ptr<Entity> IndirectEntityDamageSource::getEntity() {
// }
std::shared_ptr<ChatPacket> IndirectEntityDamageSource::getDeathMessagePacket(
std::shared_ptr<Player> player) {
std::shared_ptr<LivingEntity> player) {
std::shared_ptr<ItemInstance> held =
entity->instanceof(eTYPE_LIVINGENTITY)
? std::dynamic_pointer_cast<LivingEntity>(entity)->getCarriedItem()
: nullptr;
std::wstring additional = L"";
int type;
if (owner != NULL) {
@@ -45,6 +50,17 @@ std::shared_ptr<ChatPacket> IndirectEntityDamageSource::getDeathMessagePacket(
} else {
type = entity->GetType();
}
return std::shared_ptr<ChatPacket>(
new ChatPacket(player->name, m_msgId, type, additional));
if (held != NULL && held->hasCustomHoverName()) {
return std::shared_ptr<ChatPacket>(
new ChatPacket(player->getNetworkName(), m_msgWithItemId, type,
additional, held->getHoverName()));
} else {
return std::shared_ptr<ChatPacket>(new ChatPacket(
player->getNetworkName(), m_msgId, type, additional));
}
}
// 4J: Copy function
DamageSource* IndirectEntityDamageSource::copy() {
return new IndirectEntityDamageSource(*this);
}