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

Remove checks for existence

Browse Source
This commit is contained in:
Kinglykrab 2025-06-22 13:40:22 -04:00
parent f49968f877
commit 6a05dafe65
3 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zone/client.h
View File

@ -1358,7 +1358,7 @@ public:
}
inline bool SaveTaskState()
{
return TaskManager::Instance() != nullptr && TaskManager::Instance()->SaveClientState(this, task_state);
return TaskManager::Instance()->SaveClientState(this, task_state);
}
inline bool IsTaskStateLoaded() { return task_state != nullptr; }
inline bool IsTaskActive(int task_id) { return task_state != nullptr && task_state->IsTaskActive(task_id); }
@ -1432,13 +1432,13 @@ public:
}
inline void TaskSetSelector(Mob* mob, int task_set_id, bool ignore_cooldown)
{
if (TaskManager::Instance() && task_state) {
if (task_state) {
TaskManager::Instance()->TaskSetSelector(this, mob, task_set_id, ignore_cooldown);
}
}
inline void TaskQuestSetSelector(Mob* mob, const std::vector<int>& tasks, bool ignore_cooldown)
{
if (TaskManager::Instance() && task_state) {
if (task_state) {
TaskManager::Instance()->TaskQuestSetSelector(this, mob, tasks, ignore_cooldown);
}
}

7
zone/entity.cpp
View File

@ -4175,10 +4175,6 @@ void EntityList::ProcessProximitySay(const char *message, Client *c, uint8 langu
void EntityList::SaveAllClientsTaskState()
{
if (!TaskManager::Instance()) {
return;
}
auto it = client_list.begin();
while (it != client_list.end()) {
Client *client = it->second;
@ -4192,9 +4188,6 @@ void EntityList::SaveAllClientsTaskState()
void EntityList::ReloadAllClientsTaskState(int task_id)
{
if (!TaskManager::Instance())
return;
auto it = client_list.begin();
while (it != client_list.end()) {
Client *client = it->second;

18
zone/task_client_state.cpp
View File

@ -521,11 +521,6 @@ bool ClientTaskState::CanUpdate(Client* client, const TaskUpdateFilter& filter,
int ClientTaskState::UpdateTasks(Client* client, const TaskUpdateFilter& filter, int count)
{
if (!TaskManager::Instance())
{
return 0;
}
int max_updated = 0;
for (const auto& client_task : m_active_tasks)
@ -593,11 +588,6 @@ int ClientTaskState::UpdateTasks(Client* client, const TaskUpdateFilter& filter,
std::pair<int, int> ClientTaskState::FindTask(Client* client, const TaskUpdateFilter& filter) const
{
if (!TaskManager::Instance())
{
return std::make_pair(0, 0);
}
for (const auto& client_task : m_active_tasks)
{
const auto task = GetTaskData(client_task);
@ -1973,7 +1963,7 @@ void ClientTaskState::AcceptNewTask(
bool enforce_level_requirement
)
{
if (!TaskManager::Instance() || task_id < 0) {
if (task_id < 0) {
client->Message(Chat::Red, "Task system not functioning, or task_id %i out of range.", task_id);
return;
}
@ -2455,10 +2445,6 @@ void ClientTaskState::SyncSharedTaskZoneClientDoneCountState(
bool ClientTaskState::HasActiveTasks()
{
if (!TaskManager::Instance()) {
return false;
}
if (m_active_task.task_id != TASKSLOTEMPTY) {
return true;
}
@ -2495,7 +2481,7 @@ void ClientTaskState::LockSharedTask(Client* client, bool lock)
void ClientTaskState::EndSharedTask(Client* client, bool send_fail)
{
if (TaskManager::Instance() && m_active_shared_task.task_id != TASKSLOTEMPTY)
if (m_active_shared_task.task_id != TASKSLOTEMPTY)
{
TaskManager::Instance()->EndSharedTask(*client, m_active_shared_task.task_id, send_fail);
}