pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-01-27 09:33:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix-up after 'io_work' branch merger

Browse Source
This commit is contained in:
Uleat 2019-09-10 00:20:13 -04:00
parent 7911225960
commit 28d5c8f301
2 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
changelog.txt
View File

@ -1,27 +1,5 @@
EQEMu Changelog (Started on Sept 24, 2003 15:50)
-------------------------------------------------------
== 9/04/2019 ==
Uleat: Added code to restore rule notes to their original values
- The code is inactive by default
- Change rule 'World:RestoreRuleNotes' to 'true' to enable this feature
- Rule will not exist until the server is run for the first time after updating
== 9/02/2019 ==
Uleat: Added code to inject new rules into the 'default' ruleset and remove orphaned rules from all rulesets
- New rules are only added using the 'default' ruleset - Other rulesets will need to be added manually or through in-game updates
-- Rule notes are now loaded into the system's hard-coded entries and will now propagate properly into database updates
- Defunct rules will have their orhpaned entries removed from the `rule_values` table for the all rulesets
Note: If you would like to add these rules before starting your server so that you can modify them, start world.exe
manually and wait for the console messages to finish. It should take 5-10 seconds, or so. The world log should contain
a list of the added and removed entries, IF the `file` field of the 'Status' logging category is set to 1 or higher.
(Don't forget to manually stop the process after the update is complete.)
== 8/30/2019 ==
Uleat: Added code to inject new commands and remove orphaned commands from both command systems
- New commands are added with their status (`access`) set to the server default value - no aliases are defined
- Defunct commands will have their orhpaned entries removed from the command settings table for each system
== 8/16/2019 ==
Akkadius: Simplified the use of roamboxes and improved the AI for roambox pathing https://i.imgur.com/z33u7y9.gif
Akkadius: Implemented command #roambox set <box_size> [move_delay]

10
zone/zonedb.cpp
View File

@ -4122,15 +4122,7 @@ bool ZoneDatabase::LoadFactionData()
Log(Logs::General, Logs::Status, "%u Faction%s loaded...", faction_ids.size(), (faction_ids.size() == 1 ? "" : "s"));
// this can be removed once the 'io_work' branch has been merged
std::vector<std::string> faction_id_strings;
for (auto id : faction_ids) {
faction_id_strings.push_back(fmt::format("'{}'", id));
}
const std::string faction_id_criteria(implode(",", faction_id_strings));
// code to activate (note above)
//const std::string faction_id_criteria(implode(",", std::pair<char, char>('\'', '\''), faction_ids));
const std::string faction_id_criteria(implode(",", std::pair<char, char>('\'', '\''), faction_ids));
// load faction mins/maxes
query = fmt::format("SELECT `client_faction_id`, `min`, `max` FROM `faction_base_data` WHERE `client_faction_id` IN ({})", faction_id_criteria);