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

Merge pull request #22 from EQEmu/master

Browse Source 
Merge base back into my fork
This commit is contained in:
Paul Coene 2020-10-09 11:30:38 -04:00 committed by GitHub
commit b996f40016
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -12,7 +12,7 @@ IF(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE) SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE)
ENDIF(NOT CMAKE_BUILD_TYPE) ENDIF(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_CXX_STANDARD 11) SET(CMAKE_CXX_STANDARD 14)
SET(CMAKE_CXX_STANDARD_REQUIRED ON) SET(CMAKE_CXX_STANDARD_REQUIRED ON)
SET(CMAKE_CXX_EXTENSIONS OFF) SET(CMAKE_CXX_EXTENSIONS OFF)

3
zone/exp.cpp
View File

@ -718,7 +718,8 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) {
else else
Message(Chat::Yellow, "Welcome to level %i!", check_level); Message(Chat::Yellow, "Welcome to level %i!", check_level);
if (check_level == RuleI(Character, DeathItemLossLevel)) if (check_level == RuleI(Character, DeathItemLossLevel) &&
m_ClientVersionBit & EQ::versions::maskUFAndEarlier)
MessageString(Chat::Yellow, CORPSE_ITEM_LOST); MessageString(Chat::Yellow, CORPSE_ITEM_LOST);
if (check_level == RuleI(Character, DeathExpLossLevel)) if (check_level == RuleI(Character, DeathExpLossLevel))

11
zone/mob_movement_manager.cpp
View File

@ -1088,6 +1088,17 @@ void MobMovementManager::UpdatePath(Mob *who, float x, float y, float z, MobMove
PushFlyTo(ent.second, x, y, z, mob_movement_mode); PushFlyTo(ent.second, x, y, z, mob_movement_mode);
PushStopMoving(ent.second); PushStopMoving(ent.second);
} }
// Below for npcs that can traverse land or water so they don't sink
else if (who->GetFlyMode() == GravityBehavior::Water &&
zone->watermap->InLiquid(who->GetPosition()) &&
zone->watermap->InLiquid(glm::vec3(x, y, z)) &&
zone->zonemap->CheckLoS(who->GetPosition(), glm::vec3(x, y, z))) {
auto iter = _impl->Entries.find(who);
auto &ent = (*iter);
PushSwimTo(ent.second, x, y, z, mob_movement_mode);
PushStopMoving(ent.second);
}
else { else {
UpdatePathGround(who, x, y, z, mob_movement_mode); UpdatePathGround(who, x, y, z, mob_movement_mode);
} }