pa/eqemu-server
2
0 Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-10-08 01:13:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,842 Commits 89 Branches 159 Tags
c45395be959c321477a9353585392dc3b7e8feef
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Cook (mackal) c45395be95 Fix strcpy-param-overlap with GetGroupLeadershipInfo calls 
==1810==ERROR: AddressSanitizer: strcpy-param-overlap: memory ranges [0x7ffef04baf90,0x7ffef04baf98) and [0x7ffef04baf90, 0x7ffef04baf98) overlap
    #0 0x7f163bb9509e  (/lib/x86_64-linux-gnu/libasan.so.5+0x4f09e)
    #1 0x5652caed27b3 in Client::Handle_Connect_OP_ZoneEntry(EQApplicationPacket const*) ../zone/client_packet.cpp:1535

==1918==ERROR: AddressSanitizer: strcpy-param-overlap: memory ranges [0x7ffddc8057c0,0x7ffddc8057c8) and [0x7ffddc8057c0, 0x7ffddc8057c8) overlap
    #0 0x7fc61ee0e09e  (/lib/x86_64-linux-gnu/libasan.so.5+0x4f09e)
    #1 0x56023c149698 in WorldServer::HandleMessage(unsigned short, EQ::Net::Packet const&) ../zone/worldserver.cpp:1055
 2021-02-28 21:42:51 -05:00
Michael Cook (mackal) 66f89416d5 Merge pull request #1270 from EQEmu/bug_fix/dbcore_wrong_delete 
Fix deletes in DBcore::Open
 2021-02-27 15:30:06 -05:00
Michael Cook (mackal) 11d0da9560 Merge pull request #1274 from EQEmu/bug_fix/zlibng-pathfix 
Fix zlibng paths for appveyor
 2021-02-27 14:09:51 -05:00
Michael Cook (mackal) 8de9e86fed Merge pull request #1266 from EQEmu/bug_fix/init_PhR 
Initialize Mob::PhR
 2021-02-27 12:29:54 -05:00
Michael Cook (mackal) 05c407fbb2 Fix zlibng paths for appveyor 2021-02-27 12:12:41 -05:00
Michael Cook (mackal) aaf41001f1 zlib-ng1.dll ends up in a different path (#1268) 2021-02-27 02:57:04 -06:00
Michael Cook (mackal) 7349f99ba2 Fix deletes in DBcore::Open 
These are arrays!
 2021-02-25 00:07:36 -05:00
Michael Cook (mackal) 3630f3ec38 Initialize Mob::PhR 2021-02-23 22:34:14 -05:00
Michael Cook (mackal) 86ce506956 [Cleanup] Nuke Make/AppendAnyLenString (#1251) 
* Add a std::string overload for Database::SetMQDetectionFlag

* Replace calls to MakeAnyLenString in client_packet.cpp

At least the SetMQDetectionFlag ones

* Replace MakeAnyLenString calls in client_process

At least SetMQDectectionFlag ones

* Replace MakeAnyLenString in embparser

fmtlib actually is gross here, oh well.

* Replace MakeAnyLenString in merc

* Replace MakeAnyLenString in inventory

Also if'd out an unfinished implementation of Client::GetItemLinkHash

* Replace AppendAnyLenString in zonelist

* Replace AppendAnyLenString in zonelist

* Replace MakeAnyLenString in clientlist

* Nuke MakeAnyLenString/AppendAnyLenString

* Fix formatting string in zonelist
 2021-02-23 18:32:19 -06:00
Michael Cook (mackal) 7a46a6595c [Cleanup] use std::make_unique (#1259) 
* Convert common/eq_limits.cpp to use make_unique

* Convert common/net/console_server.cpp to use make_unique

* Convert common/net/servertalk_client_connection.cpp to use make_unique

* Convert common/net/servertalk_legacy_client_connection.cpp to use make_unique

* Convert common/net/servertalk_server.cpp to use make_unique

* Convert common/net/websocket_server.cpp to use make_unique

* Convert common/net/websocket_server_connection.cpp to use make_unique

* Convert common/shareddb.cpp to use make_unique

* Convert eqlaunch/worldserver.cpp to use make_unique

* Convert loginserver/server_manager.cpp to use make_unique

* Convert loginserver/world_server.cpp to use make_unique

* Convert queryserv/worldserver.cpp to use make_unique

* Convert ucs/worldserver.cpp to use make_unique

* Convert world/clientlist.cpp to use make_unique

* Convert world/expedition.cpp to use make_unique

* Convert world/launcher_link.cpp to use make_unique

* Convert world/login_server.cpp to use make_unique

* Convert world/main.cpp to use make_unique

* Convert world/ucs.cpp to use make_unique

* Convert world/web_interface.cpp to use make_unique

* Convert world/zonelist.cpp to use make_unique

* Convert world/zoneserver.cpp to use make_unique

* Convert zone/client.cpp to use make_unique

* Convert zone/corpse.cpp to use make_unique

* Convert zone/dynamiczone.cpp to use make_unique

* Convert zone/expedition.cpp to use make_unique

* Convert zone/main.cpp to use make_unique

* Convert zone/mob_ai.cpp to use make_unique

* Convert zone/mob_movement_manager.cpp to use make_unique

* Convert zone/pathfinder_nav_mesh.cpp to use make_unique

* Convert zone/worldserver.cpp to use make_unique
 2021-02-23 18:30:46 -06:00
Michael Cook (mackal) 0887eb0976 Fix NPC Scale Manager leaking (#1254) 
It should be fine to init further down after the early returns.

This wasn't really a leak that affected performance, but mainly moving
to shutup valgrind
 2021-02-23 11:59:03 -06:00
Michael Cook (mackal) 74ce20b256 Add string util search_deliminated_string (#1260) 
This function takes a string of deliminated an see if another string is
one of those

This function also verifies it's not finding a substring
 2021-02-23 11:52:34 -06:00
Michael Cook (mackal) 1bc9e8aff2 Merge pull request #1239 from noudess/sneak-pull 
[Game Play Mechanic] Very simple implementation of Sneak Pull
 2021-02-14 18:04:30 -05:00
Michael Cook (mackal) 2a37785a7c Merge pull request #1248 from EQEmu/remove_unused_files 
[Cleanup] Remove unused files
 2021-02-14 14:20:40 -05:00
Michael Cook (mackal) 0ef01165ea Fix some leaks of groups/raids (#1242) 
These cases probably are exceedingly rare, but they still need to be
accounted for. (As in, I don't think anyone has run into these cases too
often to cause problems)
 2021-02-12 02:07:58 -06:00
Michael Cook (mackal) f9923ffda0 Fix va_list leaks in MakeAnyLenString/AppendAnyLenString (#1240) 
Slowly leaking memory for ages!

clang-tidy complained about it
 2021-02-12 02:07:47 -06:00
Michael Cook (mackal) 8b4a886d01 Remove unused files 
idk where these came from, NUKE EM!
 2021-02-12 02:42:03 -05:00
Michael Cook (mackal) 507bbe83f3 LuaJIT calls it lua51.lib/dll on Windows ... (#1247) 2021-02-11 13:52:11 -06:00
Michael Cook (mackal) d33f806efa Add include to PATH_SUFFIXES for Windows builds (#1246) 2021-02-11 12:56:00 -06:00
Michael Cook (mackal) 10ffcf155d [Lua/Cmake] Prefer LuaJIT over normal Lua (#1235) 
* Add a separate FindLuaJit.cmake

* Remove LuaJit from our modified FindLua51.cmake

* Make use of the new FindLuaJit

The reason for splitting them up like this is so we can have a
preference for LuaJIT that's not determined by the search order in
FindLua51.cmake as well as giving the server operators the choice to
prefer normal Lua with the EQEMU_PREFER_LUA cmake option
 2021-02-08 23:10:16 -06:00
Michael Cook (mackal) 672c09ee11 Provide more search paths for luajit (#1216) 
The include folder on my system is /usr/include/luajit-2.0, added some
extra library names since mine was /usr/lib64/libluajit-5.1.so
 2021-02-07 18:42:55 -06:00
Michael Cook (mackal) 6621338064 Enforce some naming limits people were getting around 2021-02-07 17:00:48 -05:00
Michael Cook (mackal) c8dfb72cd2 Merge pull request #1222 from EQEmu/feature/op_clearaa_tit 
Identify OP_ClearLeadershipAbilities/OP_ClearAA for Tit
 2021-02-05 16:18:19 -05:00
Michael Cook (mackal) 42b34bbf87 Identify OP_ClearLeadershipAbilities/OP_ClearAA for Tit 2021-02-05 14:17:13 -05:00
Michael Cook (mackal) 4ec9ccae98 Merge pull request #1153 from thalix1337/master 
Fix for Feature/underworld, typo in SQL
 2020-12-22 12:56:09 -05:00
Michael Cook (mackal) 69a8507908 Feature/underworld (#1146) 
* Update NewZone_Structs

* Update packet translators for NewZone_Struct

* Add OP_UnderWorld OPcodes

These aren't implemented yet, but I thought it would be good to document
them. This sends up just entity ID and location when you fall
underworld. This could possibly be used to check for someone screwing
with zone data locally to warp or something I guess.

* Add database fields
 2020-12-21 17:08:04 -06:00
Michael Cook (mackal) 31019b8832 Merge pull request #1137 from EQEmu/bug_fix/rest_timer 
Save the rest_timer sooner to prevent issues
 2020-11-22 14:35:24 -05:00
Michael Cook (mackal) df4ccaf970 Merge pull request #1136 from EQEmu/bug_fix/quest_reward_charges 
Update the SummonItem call to default charges for QuestRewards
 2020-11-22 14:08:33 -05:00
Michael Cook (mackal) eb0d12f220 Save the rest_timer sooner to prevent issues 
We need to save the remaining time sooner to prevent circumstances
described here:

http://www.projecteq.net/forums/index.php?threads/raid-out-of-combat-regen-timers-resetting-on-non-raid-mobs.16114/
 2020-11-17 15:47:12 -05:00
Michael Cook (mackal) 60254105f1 Update the SummonItem call to default charges for QuestRewards 
This should summon the item at max charges, if it has charges
 2020-11-05 19:40:04 -05:00
Michael Cook (mackal) 32f4722c0f Only UF and earlier have the CORPSE_ITEM_LOST string 
Let's not confuse players with missing messages I guess
 2020-09-20 13:55:45 -04:00
Michael Cook (mackal) 1106e404c7 Merge pull request #1121 from EQEmu/bug_fix/pet_affinity_solo_fix 
Fix issue where a group buff was casted on a solo player
 2020-09-10 14:25:37 -04:00
Michael Cook (mackal) 6f2b39792a Fix issue where a group buff was casted on a solo player 
The pet affinity in this case was checking the caster's AAs not the
target's like it should
 2020-09-08 15:57:17 -04:00
Michael Cook (mackal) 84a75f2a77 Fix missing arg to client message in #task 2020-08-19 17:13:28 -04:00
Michael Cook (mackal) 539de20a11 Fix memory leak for virtual zone line branch 2020-08-18 23:32:45 -04:00
Michael Cook (mackal) b9f01e0d1c Merge pull request #1107 from fryguy503/percentheal_aggro 
[Aggro] PercentalHeal should be included in aggro generation
 2020-08-17 21:17:40 -04:00
Michael Cook (mackal) f7e997fba1 Fix NPC AI casting of ST_AEClientV1 
As noted, I think we do this check incorrectly, but this should work
fine and matches other similar spells, let's get it good enough first.
 2020-08-17 18:04:52 -04:00
Michael Cook (mackal) 06104b624a Merge pull request #1062 from EQEmu/istaunting 
Add IsTaunting() to Perl/Lua.
 2020-05-15 17:44:59 -04:00
Michael Cook (mackal) d042b0831a Merge pull request #1061 from noudess/NewFishing 
New fishing
 2020-05-12 13:31:52 -04:00
Michael Cook (mackal) 0e6a0b5a70 Add Item SubType to data structures and DB 2020-05-09 22:37:35 -04:00
Michael Cook (mackal) 7f3e4e3438 Merge pull request #1050 from EQEmu/feature/subtype_to_structs 
Identify SubType in Item structs in some clients
 2020-05-09 15:22:06 -04:00
Michael Cook (mackal) 572ad1b6ab Identify SubType in Item structs in some clients 
This maybe in older clients as well, but I couldn't verify it and those
clients never did anything with this field so it doesn't matter.

MQ2 calls this SubClass, but we call the field it's a "sub" of Type so I
figured we'd call it SubType.

We still need to rename the DB field and handle it server side etc
 2020-05-08 12:56:10 -04:00
Michael Cook (mackal) 89f5b0b71e Merge pull request #1040 from alimalkhalifa/redundant-check-during-enter-world 
Removed redundant check during enter world
 2020-04-19 15:22:18 -04:00
Michael Cook (mackal) 5ce1fef9ec Merge pull request #1039 from alimalkhalifa/gitignore-win-64 
Added a VS ignore for x64 compiles
 2020-04-17 19:58:20 -04:00
Michael Cook (mackal) 874ca053f7 Merge pull request #1038 from alimalkhalifa/fix_charm_break_during_cast_lifetap_nuke 
Fix edge case with NPC pet owners charming PCs
 2020-04-17 14:19:13 -04:00
Michael Cook (mackal) 7aa8db76f4 Merge pull request #1016 from noudess/patch-14 
Update ruletypes.h
 2020-04-02 14:44:52 -04:00
Michael Cook (mackal) 3708efd8df Merge pull request #984 from EQEmu/bug_fix/split_in_raid 
Fix /split while in a raid
 2020-03-08 01:03:16 -05:00
Michael Cook (mackal) 1d907564e9 Merge pull request #986 from regneq/master 
Faction conning indifferent regardless of faction level in no-combat zones.
 2020-03-07 22:01:26 -05:00
Michael Cook (mackal) a3eb74b855 Fix /split while in a raid 
This still doesn't add support for /autosplit in a raid, how should that
work?

This changes the Raid::SplitMoney to take a group ID and fails when
provided with RAID_GROUPLESS. This does change behavior, but I'm not
sure if it was ever used so ...
 2020-03-05 14:37:43 -05:00
Michael Cook (mackal) 6fb0042e3f Add packet struct and ops for AdvancedLoreText 
Just stuff if people want to start working on it
 2020-02-18 15:50:01 -05:00
Michael Cook (mackal) a63dc7d5e0 Merge pull request #974 from noudess/master 
Added a rule to disallow click training of tomes and fall back to handins.
 2020-02-16 14:37:56 -05:00
Michael Cook (mackal) 67449de27e Merge pull request #973 from TheGrandPackard/Character-PetsUseReagents-Fix-Necro-Spells 
Add Necromancer pet spell effect id to pet spell reagent check
 2020-02-16 14:37:26 -05:00
Michael Cook (mackal) a4a70cf225 Merge pull request #969 from EQEmu/bug_fix/loh_skill_death_reset 
LoH skill needs to be reset on death
 2020-02-06 19:50:30 -05:00
Michael Cook (mackal) 29fccd9239 LoH skill needs to be reset on death 2020-02-06 16:44:46 -05:00
Michael Cook (mackal) cdc82f0ba7 Merge pull request #968 from EQEmu/feature/aa_timer_reset_on_death 
Implement AA timers reset on death
 2020-02-06 16:30:10 -05:00
Michael Cook (mackal) 2f5909d4cb Implement AA timers reset on death 
This is a field in the packet, live only uses this for Lay on Hands

Currently I didn't add this to the packet since it has 0 effect on the
client.

We could move this field to aa_ranks which would give more flexibility
for custom servers, but no one said they wanted it there.
 2020-02-06 14:20:18 -05:00
Michael Cook (mackal) 13c2df7eb1 Merge pull request #967 from EQEmu/feature/global_loot_hot_zone 
Add hot_zone filtering for global loot
 2020-02-06 12:56:20 -05:00
Michael Cook (mackal) 16ac6f624b Remove extra whitespace 2020-02-06 01:59:18 -05:00
Michael Cook (mackal) 501204a4d2 Add hot_zone filtering for global loot 
We do this in GlobalLootEntry::PassesRules since we want to check if the
hot zone status changes during run time

Value can be null, if null it's not checked. If the value is 0 the zone
must not be a hot zone (I guess one might want that) and if it's not 0,
the zone must be a hot zone
 2020-02-06 01:52:35 -05:00
Michael Cook (mackal) 8bcef6c2e7 Fix BodyType bug in GlobalLoot 2020-02-06 01:08:53 -05:00
Michael Cook (mackal) 2db47adf7b Merge pull request #966 from noudess/master 
Idle NPC mana regen
 2020-02-05 21:17:23 -05:00
Michael Cook (mackal) 2d24cdf5e4 Merge pull request #963 from noudess/patch-10 
Update command.cpp
 2020-02-04 13:24:49 -05:00
Michael Cook (mackal) 424b669cbb Target not required for newer clients in QuestReward 2020-02-02 16:39:46 -05:00
Michael Cook (mackal) f195820854 Merge pull request #959 from hgtw/fix/raid-invite-crash 
Fix zone crash when a group member raid invites own group leader
 2020-02-01 22:59:33 -05:00
Michael Cook (mackal) 59903313e4 Expand Lua's Client QuestReward function 
You can now use it to summon up to 8 items ex:
`e.other:QuestReward(e.self, {items = {28745, 28092}, exp = 250})`

This expands the version that takes a table. The new item is a table (in
the main table) called items, which needs to be auto keyed like the
example above. If you also provide the old itemid key, it will be
ignored if the items is there.
 2020-02-01 22:48:39 -05:00
Michael Cook (mackal) b351d3718a Merge pull request #961 from noudess/patch-7 
Fix FixZ regarding the use of model in npc_types
 2020-02-01 21:55:53 -05:00
Michael Cook (mackal) b02e87cce7 Fix Client::QuestReward for struct adjustment 2020-02-01 19:54:26 -05:00
Michael Cook (mackal) 50a39057e4 Update QuestReward_Struct 2020-02-01 19:27:15 -05:00
Michael Cook (mackal) 6dee837f67 Merge pull request #960 from noudess/patch-6 
Further refine monk weight checks for floating point
 2020-01-30 15:41:25 -05:00
Michael Cook (mackal) ff897dc90a Update CURRENT_BINARY_DATABASE_VERSION 2020-01-24 20:36:33 -05:00
Michael Cook (mackal) f73f72b2b2 Merge pull request #956 from regneq/master 
New pathgrid types.  fixed an issue where npc would face north when pause and heading were set at -1.
 2020-01-24 20:31:10 -05:00
Michael Cook (mackal) c590cf7c35 Let's try updating travis to bionic 2020-01-23 23:36:13 -05:00
Michael Cook (mackal) f6ed4bb888 Merge pull request #952 from noudess/patch-4 
Fix formula for mana
 2020-01-20 14:49:23 -05:00
Michael Cook (mackal) 6c91786cfb Merge pull request #950 from noudess/patch-3 
Update attack.cpp
 2020-01-19 16:11:20 -05:00
Michael Cook (mackal) 43df845233 Fix issue with overflow in Mob::SendHPUpdate 2020-01-18 21:42:51 -05:00
Michael Cook (mackal) feefd7a23b Update default NPC:NPCGatePercent value to something more live like 2020-01-17 17:30:38 -05:00
Michael Cook (mackal) 5a1eac010b Merge pull request #945 from noudess/patch-2 
Update waypoints.cpp
 2020-01-17 14:52:31 -05:00
Michael Cook (mackal) e1408ede6b Remove AdventureManager::Load since it doesn't do anything 2020-01-16 19:22:17 -05:00
Michael Cook (mackal) 4241fba7e2 Forgot 2 exceptions 2020-01-16 19:10:04 -05:00
Michael Cook (mackal) 139b6c34e5 Change things -Wcatch-value complains about to references 2020-01-16 19:03:36 -05:00
Michael Cook (mackal) baf4cc62eb Fix format truncation in RoF2 OP_Trader 2020-01-16 18:04:20 -05:00
Michael Cook (mackal) 14402c9c41 Fix unreachable switch statements in console_server_connection.cpp 2020-01-16 17:44:46 -05:00
Michael Cook (mackal) e4c4e5edb2 References shouldn't be null 2020-01-16 17:17:31 -05:00
Michael Cook (mackal) e6a14beb2e Remove another unnecessary this == null check 2020-01-16 17:06:11 -05:00
Michael Cook (mackal) 945ca1278c Remove some unnecessary this == null checks 2020-01-16 17:02:35 -05:00
Michael Cook (mackal) a307747c29 Nuke unused command_itemtest 2020-01-16 16:51:24 -05:00
Michael Cook (mackal) 099da513ff Remove some unused misc.cpp functions (encode/decode) 
These were unused and throwing warnings, so throw them away!
 2020-01-16 16:18:08 -05:00
Michael Cook (mackal) 607379110b Add some focus effects bots were missing 2020-01-16 16:00:38 -05:00
Michael Cook (mackal) 7ce88b30ad Remove Bot::BotfocusType 
This was just a maintenance burden keeping it in sync with focusType
(and it wasn't!)
 2020-01-16 15:47:25 -05:00
Michael Cook (mackal) 28b0526857 Change NPCType::deity to uint32 to match client data type 
Fixes overflow warning in bot.cpp
Shouldn't need DeityAgnostic_LB anymore either
 2020-01-16 15:16:21 -05:00
Michael Cook (mackal) d5067c4c3a Treat bots like PCs for pcnpc_only_flag 2020-01-15 19:30:47 -05:00
Michael Cook (mackal) 3a10131a00 Add missing currently_fleeing flag to sanity check 2020-01-03 15:50:10 -05:00
Michael Cook (mackal) a94072e3ea Fix CheckFlee logic 
This /should/ be correct. But it doesn't explain other issues we've seen
on some servers
 2020-01-03 15:49:20 -05:00
Michael Cook (mackal) a7479a628c Use CastTime == 0 on clickies to prevent reagent consumption 
This /may/ not be correct, but we think it is
 2019-12-29 23:00:42 -05:00
Michael Cook (mackal) 53a289a6bc Refactor Mob::CastedSpellFinished 
We now only call GetInv().GetItem() once
 2019-12-29 21:40:36 -05:00
Michael Cook (mackal) c90326f585 Merge pull request #933 from fryguy503/no_trade_combat 
Mobs will not trade anymore if they are currently in combat.
 2019-11-18 21:59:24 -05:00
Michael Cook (mackal) dff23793c6 Merge pull request #930 from noudess/patch-2 
Fix damage done by poison proc changes
 2019-11-02 15:54:09 -04:00
Michael Cook (mackal) b0efe88a03 Merge pull request #922 from noudess/spawn2 
Fix some bugs with the use of the model field in npc_types
 2019-10-15 21:02:36 -04:00
Michael Cook (mackal) 37d4371acd Merge pull request #915 from noudess/spawn2 
Old School poison changes to be close to live.  Added extending proci…
 2019-10-10 17:32:48 -04:00
Michael Cook (mackal) db085b7126 Merge pull request #911 from noudess/spawn2 
Old school apply poison was allowing multiple poisons at once.
 2019-10-07 17:18:35 -04:00