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

Merge pull request #1180 from noudess/boat

Browse Source 
Allow boats flymode to be overridden by local db
This commit is contained in:
Chris Miles 2021-01-21 18:26:05 -06:00 committed by GitHub
commit ca98ea9872
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/mob.cpp
View File

@ -1197,10 +1197,6 @@ void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho)
else else
ns->spawn.flymode = flymode; ns->spawn.flymode = flymode;
if(IsBoat()) {
ns->spawn.flymode = GravityBehavior::Floating;
}
ns->spawn.lastName[0] = '\0'; ns->spawn.lastName[0] = '\0';
strn0cpy(ns->spawn.lastName, lastname, sizeof(ns->spawn.lastName)); strn0cpy(ns->spawn.lastName, lastname, sizeof(ns->spawn.lastName));

5
zone/npc.cpp
View File

@ -230,9 +230,14 @@ NPC::NPC(const NPCType *npc_type_data, Spawn2 *in_respawn, const glm::vec4 &posi
adventure_template_id = npc_type_data->adventure_template; adventure_template_id = npc_type_data->adventure_template;
flymode = iflymode; flymode = iflymode;
// If server has set a flymode in db honor it over all else.
// If server has not set a flymde in db, and this is a boat - force floating.
if (npc_type_data->flymode >= 0) { if (npc_type_data->flymode >= 0) {
flymode = static_cast<GravityBehavior>(npc_type_data->flymode); flymode = static_cast<GravityBehavior>(npc_type_data->flymode);
} }
else if (IsBoat()) {
flymode = GravityBehavior::Floating;
}
guard_anim = eaStanding; guard_anim = eaStanding;
roambox_distance = 0; roambox_distance = 0;