pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-01-05 12:33:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,223 Commits 87 Branches 159 Tags
Commit Graph

4978 Commits

Author SHA1 Message Date
Akkadius
85daee85b8 Move spawn events from content table to server 2020-04-18 23:26:53 -05:00
Akkadius
e4748a01e0 Fix tradeskill combine logic [skip ci] 2020-04-18 21:50:00 -05:00
Akkadius
472c0cd196 More tweaks [skip ci] 2020-04-18 20:03:34 -05:00
Akkadius
df43a23d98 Another adjustment [skip ci] 2020-04-18 19:52:56 -05:00
Akkadius
74c878a481 Fix [skip ci] 2020-04-18 19:49:20 -05:00
Akkadius
093509baa9 Few adjustments [skip ci[ 2020-04-18 19:46:19 -05:00
Akkadius
b8c44ee41b Fix container interaction [skip ci] 2020-04-18 18:19:59 -05:00
Akkadius
a0f8bbb3b9 Merge branch 'master' of https://github.com/EQEmu/Server into integration/multi-tenancy-expansions-repository 2020-04-18 02:31:43 -05:00
Ali
15f3697df1 Fix edge case with NPC pet owners charming PCs 
* Addresses #1036
* Cleaned up if statement formatting
* Using Mob::GetOwnerOrSelf() now, which accounts for the edge case

NB: The Mob::SpellOnTarget() and Mob::CommonDamage() methods really
should be looked at and spell logic combined somehow.  Both have if
statements that dodge around the other's conditions to decide which
method sends the CombatDamage_Struct packet
 2020-04-17 10:56:43 +03:00
Chris Miles
16cfad1966
UCS / Raid / Zone Fixes (#1033) 
* Cache EntityList::GetRaidByClient

* Adjustments [skip ci]

* Update entity [skip ci]

* More cleanup [skip ci]

* More tweaks [skip ci]

* Cleanup [skip ci]

* Fix bugs with UCS reconnection on crash / exit, not adding soft deleted characters, put main loop on UV lib

* Reduce log spam that should be debugging; send keepalives to clients so that they properly prune from the connection list

* Shutdown the eventloop to properly shutdown the zone versus calling a hard exit
 2020-04-14 23:28:43 -05:00
Akkadius
5b4c4bfd66 Implement content flags 2020-04-11 05:48:41 -05:00
Akkadius
47b8aa3f18 Export quest calls 2020-04-11 04:38:42 -05:00
Akkadius
77cacf5cd1 Add std::string WorldContentService::GetCurrentExpansionName() [skip ci] 2020-04-11 03:11:09 -05:00
Akkadius
5c7eb0707f Bulk load goallists 2020-04-11 02:19:58 -05:00
Akkadius
423bb7f0b3 Adjust content bootstrapping in zone [skip ci] 2020-04-11 01:58:35 -05:00
Akkadius
0dc3e5ba35 Add jank permanent reference pass back in [skip ci] 2020-04-10 03:20:41 -05:00
Akkadius
bd8e94ff17 Use version 1 for GH 2020-04-10 02:20:56 -05:00
Akkadius
d89b2f11b5 Get time remaining directly from database for now, this needs to be cached better at the zone state level, I'll refactor this when repositories are merged in 2020-04-10 02:03:30 -05:00
Akkadius
88ff56b2f2 Add client->SendToGuildHall - have instances properly cycle out IDs 2020-04-10 01:43:00 -05:00
Alex
cbd1f42a08 Merge conflict fixes... 2020-04-06 18:57:13 -04:00
Alex
f8735cf9ba
Update lua_general.cpp 2020-04-06 18:06:18 -04:00
Chris Miles
eb00667eab
Merge pull request #1027 from noudess/patch-15 
Propose change in location of Stun check as possible resolution to crash
 2020-04-06 15:40:39 -05:00
Chris Miles
cbc0ada454
Merge pull request #1017 from noudess/master 
Fix Issue #849.
 2020-04-06 15:39:43 -05:00
Alex
c6e4b5647f
Merge branch 'master' into getclassname 2020-04-06 16:25:29 -04:00
Alex
40ef4c799b
Update embparser_api.cpp 2020-04-06 16:22:08 -04:00
Alex
8ba7ddd054
Merge branch 'master' into getcurrencyitemid 2020-04-06 16:21:29 -04:00
Paul Coene
973fd376e5
Propose change in location of Stun check as possible resolution to crash 2020-04-06 08:23:57 -04:00
Paul Coene
b5575133cd
Put in braces in my new function as well as the source function. 
The entire file has implied braces...  I'd change them all but fear making a mistake.
 2020-04-06 08:10:15 -04:00
Akkadius
2b1b786f02 Merge branch 'master' of https://github.com/EQEmu/Server into integration/multi-tenancy-expansions-repository 2020-04-06 02:55:46 -05:00
Chris Miles
6f846dc4ff
Merge pull request #1025 from KinglyKrab/getracename 
Add getracename(race_id) to Perl/Lua.
 2020-04-06 01:57:54 -05:00
Chris Miles
0461fc1789
Merge pull request #1024 from KinglyKrab/getskillname 
Add getskillname(skill_id) to Perl/Lua.
 2020-04-06 01:57:12 -05:00
Chris Miles
aa6264266e
Merge pull request #1022 from KinglyKrab/getcurrencyid 
Add getcurrencyid(item_id) to Perl/Lua.
 2020-04-06 01:56:25 -05:00
Akkadius
700d062606 Fix windows compile 2020-04-06 01:51:58 -05:00
Alex
c2c6282cc7 Add getclassname(class_id, level) to Perl/Lua. 2020-04-06 02:26:58 -04:00
Alex
fab071d9da Add getracename(race_id) to Perl/Lua. 2020-04-06 02:02:20 -04:00
Alex
358bd60716 Add getskillname(skill_id) to Perl/Lua. 2020-04-06 01:36:46 -04:00
Alex
03ca345b37 Add getcurrencyitemid(currency_id) to Perl/Lua. 2020-04-06 01:07:59 -04:00
Alex
6ddcc2bb8a Add getcurrencyid(item_id) to Perl/Lua. 2020-04-06 00:49:57 -04:00
Akkadius
a19bb7b544 Merge branch 'feature/peq-expansions' of https://github.com/EQEmu/Server into feature/generated-repositories 2020-04-05 23:21:21 -05:00
Akkadius
be57c57029 More adjustments [skip ci[ 2020-04-05 23:11:25 -05:00
Alex
02cac686b6 Add getnpcnamebyid(npc_id) to Perl/Lua. 2020-04-06 00:10:58 -04:00
Alex
035bac1044
Update embparser_api.cpp 2020-04-05 21:22:23 -04:00
Alex
5a8d467d25
Merge branch 'master' into getcharnamebyid 2020-04-05 21:21:15 -04:00
Alex
ae959be5ac Added getcharnamebyid(char_id) to Perl/Lua. 2020-04-05 21:18:05 -04:00
Akkadius
0cce61e85d Filter GetZoneCFG [skip ci] 2020-04-05 20:11:05 -05:00
Akkadius
c8722ea789 Filter start_zones [skip ci] 2020-04-05 19:58:04 -05:00
Akkadius
2f4a217f7a Filter zone_points [skip ci] 2020-04-05 19:49:04 -05:00
Akkadius
9aac84a405 filter traps [skip ci] 2020-04-05 19:45:45 -05:00
Alex
41d0b1a947 Add getcharidbyname(name) to Perl/Lua. 2020-04-05 20:41:49 -04:00
Akkadius
9fbcd99be2 Filter ground spawns [skip ci] 2020-04-05 19:40:40 -05:00