flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Death messages for tamed pets and ocelots are now tamable. (#5243)

Browse Source 
* Fixing bugs regarding wolfs and ocelots

* Death messages appear after killing tamed ocelots and wolfs

* Style fix

* Added myself to the CONTRIBUTORS file

* Removed redundant string initialization

* Removed an unsafe cast.

* Changed the order of initialization of fields in constuctor of class cOcelot
This commit is contained in:
TheHyper45 2021-06-19 22:25:24 +01:00 committed by GitHub
parent 4e48464bb3
commit 3b35a00397
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 115 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -72,6 +72,7 @@ structinf (xdot)
sweetgiorni
Sxw1212
Taugeshtu
TheHyper45
theophriene
tigerw (Tiger Wang)
tonibm19

100
src/Entities/Entity.cpp
View File

@ -2285,3 +2285,103 @@ void cEntity::BroadcastLeashedMobs()
}
}
}
void cEntity::BroadcastDeathMessage(TakeDamageInfo & a_TDI)
{
cPluginManager * PluginManager = cRoot::Get()->GetPluginManager();
AString Name;
if (IsPlayer())
{
cPlayer * Player = static_cast<cPlayer *>(this);
Name = Player->GetName();
}
else if (IsMob())
{
cMonster * Monster = static_cast<cMonster *>(this);
if (Monster->HasCustomName())
{
Name = Monster->GetCustomName();
}
else
{
// Tamed ocelots are really cats in vanilla.
if (Monster->IsTame() && (Monster->GetClass() == AString("cOcelot")))
{
Name = "Cat";
}
else
{
Name = Monster->GetClass();
Name.erase(Name.begin()); // Erase the 'c' of the class (e.g. "cWitch" -> "Witch")
}
}
}
else
{
// If the entity is neither a player nor a mob, we should quit.
return;
}
if (a_TDI.Attacker == nullptr)
{
const AString DamageText = [&]
{
switch (a_TDI.DamageType)
{
case dtRangedAttack: return "was shot";
case dtLightning: return "was plasmified by lightining";
case dtFalling: return GetRandomProvider().RandBool() ? "fell to death" : "hit the ground too hard";
case dtDrowning: return "drowned";
case dtSuffocating: return GetRandomProvider().RandBool() ? "git merge'd into a block" : "fused with a block";
case dtStarving: return "forgot the importance of food";
case dtCactusContact: return "was impaled on a cactus";
case dtMagmaContact: return "discovered the floor was lava";
case dtLavaContact: return "was melted by lava";
case dtPoisoning: return "died from septicaemia";
case dtWithering: return "is a husk of their former selves";
case dtOnFire: return "forgot to stop, drop, and roll";
case dtFireContact: return "burnt themselves to death";
case dtInVoid: return "somehow fell out of the world";
case dtPotionOfHarming: return "was magicked to death";
case dtEnderPearl: return "misused an ender pearl";
case dtAdmin: return "was administrator'd";
case dtExplosion: return "blew up";
case dtAttack: return "was attacked by thin air";
case dtEnvironment: return "played too much dress up"; // This is not vanilla - added a own pun
}
UNREACHABLE("Unsupported damage type");
}();
AString DeathMessage = Printf("%s %s", Name.c_str(), DamageText.c_str());
PluginManager->CallHookKilled(*this, a_TDI, DeathMessage);
if (DeathMessage != AString(""))
{
GetWorld()->BroadcastChatDeath(DeathMessage);
}
}
else if (a_TDI.Attacker->IsPlayer())
{
cPlayer * Killer = static_cast<cPlayer *>(a_TDI.Attacker);
AString DeathMessage = Printf("%s was killed by %s", Name.c_str(), Killer->GetName().c_str());
PluginManager->CallHookKilled(*this, a_TDI, DeathMessage);
if (DeathMessage != AString(""))
{
GetWorld()->BroadcastChatDeath(DeathMessage);
}
}
else
{
AString KillerClass = a_TDI.Attacker->GetClass();
KillerClass.erase(KillerClass.begin()); // Erase the 'c' of the class (e.g. "cWitch" -> "Witch")
AString DeathMessage = Printf("%s was killed by a %s", Name.c_str(), KillerClass.c_str());
PluginManager->CallHookKilled(*this, a_TDI, DeathMessage);
if (DeathMessage != AString(""))
{
GetWorld()->BroadcastChatDeath(DeathMessage);
}
}
}

2
src/Entities/Entity.h
View File

@ -550,6 +550,8 @@ public:
/** Returs whether the entity has any mob leashed to it. */
bool HasAnyMobLeashed() const { return m_LeashedMobs.size() > 0; }
/** Announces a death message on chat about killing the entity. */
void BroadcastDeathMessage(TakeDamageInfo & a_TDI);
protected:

59
src/Entities/Player.cpp
View File

@ -863,65 +863,8 @@ void cPlayer::KilledBy(TakeDamageInfo & a_TDI)
m_World->SpawnItemPickups(Pickups, GetPosX(), GetPosY(), GetPosZ(), 10);
SaveToDisk(); // Save it, yeah the world is a tough place !
cPluginManager * PluginManager = cRoot::Get()->GetPluginManager();
if (a_TDI.Attacker == nullptr)
{
const AString DamageText = [&]
{
switch (a_TDI.DamageType)
{
case dtRangedAttack: return "was shot";
case dtLightning: return "was plasmified by lightining";
case dtFalling: return GetRandomProvider().RandBool() ? "fell to death" : "hit the ground too hard";
case dtDrowning: return "drowned";
case dtSuffocating: return GetRandomProvider().RandBool() ? "git merge'd into a block" : "fused with a block";
case dtStarving: return "forgot the importance of food";
case dtCactusContact: return "was impaled on a cactus";
case dtMagmaContact: return "discovered the floor was lava";
case dtLavaContact: return "was melted by lava";
case dtPoisoning: return "died from septicaemia";
case dtWithering: return "is a husk of their former selves";
case dtOnFire: return "forgot to stop, drop, and roll";
case dtFireContact: return "burnt themselves to death";
case dtInVoid: return "somehow fell out of the world";
case dtPotionOfHarming: return "was magicked to death";
case dtEnderPearl: return "misused an ender pearl";
case dtAdmin: return "was administrator'd";
case dtExplosion: return "blew up";
case dtAttack: return "was attacked by thin air";
case dtEnvironment: return "played too much dress up"; // This is not vanilla - added a own pun
}
UNREACHABLE("Unsupported damage type");
}();
AString DeathMessage = Printf("%s %s", GetName().c_str(), DamageText.c_str());
PluginManager->CallHookKilled(*this, a_TDI, DeathMessage);
if (DeathMessage != AString(""))
{
GetWorld()->BroadcastChatDeath(DeathMessage);
}
}
else if (a_TDI.Attacker->IsPlayer())
{
cPlayer * Killer = static_cast<cPlayer *>(a_TDI.Attacker);
AString DeathMessage = Printf("%s was killed by %s", GetName().c_str(), Killer->GetName().c_str());
PluginManager->CallHookKilled(*this, a_TDI, DeathMessage);
if (DeathMessage != AString(""))
{
GetWorld()->BroadcastChatDeath(DeathMessage);
}
}
else
{
AString KillerClass = a_TDI.Attacker->GetClass();
KillerClass.erase(KillerClass.begin()); // Erase the 'c' of the class (e.g. "cWitch" -> "Witch")
AString DeathMessage = Printf("%s was killed by a %s", GetName().c_str(), KillerClass.c_str());
PluginManager->CallHookKilled(*this, a_TDI, DeathMessage);
if (DeathMessage != AString(""))
{
GetWorld()->BroadcastChatDeath(DeathMessage);
}
}
BroadcastDeathMessage(a_TDI);
m_Stats.Custom[CustomStatistic::Deaths]++;
m_Stats.Custom[CustomStatistic::TimeSinceDeath] = 0;

9
src/Mobs/Monster.cpp
View File

@ -605,6 +605,15 @@ void cMonster::KilledBy(TakeDamageInfo & a_TDI)
{
m_World->BroadcastSoundEffect(m_SoundDeath, GetPosition(), 1.0f, 0.8f);
}
if (IsTame())
{
if ((m_MobType == mtWolf) || (m_MobType == mtOcelot) || (m_MobType == mtCat) || (m_MobType == mtParrot))
{
BroadcastDeathMessage(a_TDI);
}
}
int Reward;
switch (m_MobType)
{

1
src/Mobs/Ocelot.cpp
View File

@ -26,6 +26,7 @@ cOcelot::cOcelot(void) :
m_IsTame(false),
m_IsBegging(false),
m_CatType(ctWildOcelot),
m_CheckPlayerTickCount(),
m_OwnerName()
{
}

1
src/Mobs/Wolf.cpp
View File

@ -166,6 +166,7 @@ void cWolf::ReceiveNearbyFightInfo(const cUUID & a_PlayerID, cPawn * a_Opponent,
void cWolf::OnRightClicked(cPlayer & a_Player)
{
cMonster::OnRightClicked(a_Player);
const cItem & EquippedItem = a_Player.GetEquippedItem();
const int EquippedItemType = EquippedItem.m_ItemType;