pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-12 18:12:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Swim Skillup and Underwater Fall Damage Fix (#3885)

Browse Source 
* [Bug Fix] Swim Skillup and Underwater Fall Damage Fix

No fall damage underwater, need to move to skill up swimming

* Requested Changes
This commit is contained in:
Fryguy 2024-01-07 12:34:25 -05:00 committed by GitHub
parent e52e4d5b3f
commit 51dc62dfb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zone/client_packet.cpp
View File

@ -5062,7 +5062,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
} }
if (zone->watermap) { if (zone->watermap) {
if (zone->watermap->InLiquid(glm::vec3(m_Position))) { if (zone->watermap->InLiquid(glm::vec3(m_Position)) && IsMoving()) {
CheckIncreaseSkill(EQ::skills::SkillSwimming, nullptr, -17); CheckIncreaseSkill(EQ::skills::SkillSwimming, nullptr, -17);
// Dismount horses when entering water // Dismount horses when entering water
@ -6242,6 +6242,13 @@ void Client::Handle_OP_EnvDamage(const EQApplicationPacket *app)
} }
if (ed->dmgtype == EQ::constants::EnvironmentalDamage::Falling) { if (ed->dmgtype == EQ::constants::EnvironmentalDamage::Falling) {
if (zone->HasWaterMap()) {
auto target_position = glm::vec3(GetX(), GetY(), GetZ());
if (!zone->watermap->InLiquid(target_position)) {
return;
}
}
uint32 mod = spellbonuses.ReduceFallDamage + itembonuses.ReduceFallDamage + aabonuses.ReduceFallDamage; uint32 mod = spellbonuses.ReduceFallDamage + itembonuses.ReduceFallDamage + aabonuses.ReduceFallDamage;
damage -= damage * mod / 100; damage -= damage * mod / 100;
} }