pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 09:06:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge upstream/master to incorporate EQEmu fixes

Browse Source 
Resolve CMake style conflict in common/CMakeLists.txt by adopting
the lowercase CMake command style used consistently throughout
the upstream codebase.
This commit is contained in:
Claude
2026-01-24 05:02:16 +00:00
parent 54d54f79ca 9d2cc213ce
commit 385b9922aa
1869 changed files with 10045 additions and 67384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spells.cpp
+28 -40
View File
@@ -66,46 +66,34 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
and not SpellFinished().
*/
#include "../common/bodytypes.h"
#include "../common/classes.h"
#include "../common/global_define.h"
#include "../common/eqemu_logsys.h"
#include "../common/item_instance.h"
#include "../common/rulesys.h"
#include "../common/spdat.h"
#include "../common/strings.h"
#include "../common/data_verification.h"
#include "../common/misc_functions.h"
#include "../common/events/player_event_logs.h"
#include "../common/repositories/character_corpses_repository.h"
#include "../common/repositories/spell_buckets_repository.h"
#include "../common/data_bucket.h"
#include "quest_parser_collection.h"
#include "string_ids.h"
#include "worldserver.h"
#include "fastmath.h"
#include "lua_parser.h"
#include <assert.h>
#include <algorithm>
#include "queryserv.h"
#ifndef WIN32
#include <stdlib.h>
#include "../common/unix.h"
#endif
#ifdef _GOTFRAGS
#include "../common/packet_dump_file.h"
#endif
#include "bot.h"
#include "mob_movement_manager.h"
#include "client.h"
#include "mob.h"
#include "water_map.h"
#include "common/bodytypes.h"
#include "common/classes.h"
#include "common/data_bucket.h"
#include "common/data_verification.h"
#include "common/eqemu_logsys.h"
#include "common/events/player_event_logs.h"
#include "common/item_instance.h"
#include "common/misc_functions.h"
#include "common/repositories/character_corpses_repository.h"
#include "common/repositories/spell_buckets_repository.h"
#include "common/rulesys.h"
#include "common/spdat.h"
#include "common/strings.h"
#include "zone/bot.h"
#include "zone/client.h"
#include "zone/fastmath.h"
#include "zone/lua_parser.h"
#include "zone/mob_movement_manager.h"
#include "zone/queryserv.h"
#include "zone/quest_parser_collection.h"
#include "zone/string_ids.h"
#include "zone/water_map.h"
#include "zone/worldserver.h"
#include <algorithm>
#include <cassert>
extern Zone *zone;
extern volatile bool is_zone_loaded;
@@ -6287,7 +6275,7 @@ bool Client::SpellBucketCheck(uint16 spell_id, uint32 character_id)
k.key = e.bucket_name;
const auto& b = DataBucket::GetData(k);
const auto& b = DataBucket::GetData(&database, k);
return zone->CompareDataBucket(e.bucket_comparison, e.bucket_value, b.value);
}