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

Merge branch 'bems_changes' of https://github.com/Barathos/Server into bems_changes

Browse Source
This commit is contained in:
Barathos
2025-06-23 09:59:48 -07:00
parent 10840753b0 bff52d5ee9
commit 49975b64d3
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/embparser_api.cpp
+6 -1
View File
@@ -1271,6 +1271,11 @@ void Perl__failtask(int task_id)
quest_manager.failtask(task_id); quest_manager.failtask(task_id);
} }
bool Perl__completetask(int task_id)
{
return quest_manager.completetask(task_id);
}
bool Perl__uncompletetask(int task_id) bool Perl__uncompletetask(int task_id)
{ {
return quest_manager.uncompletetask(task_id); return quest_manager.uncompletetask(task_id);
@@ -6633,7 +6638,7 @@ void perl_register_quest()
package.add("faction", (void(*)(int, int, int))&Perl__faction); package.add("faction", (void(*)(int, int, int))&Perl__faction);
package.add("factionvalue", &Perl__FactionValue); package.add("factionvalue", &Perl__FactionValue);
package.add("failtask", &Perl__failtask); package.add("failtask", &Perl__failtask);
package.add("completetask", &Perl__uncompletetask); package.add("completetask", &Perl__completetask);
package.add("uncompletetask", &Perl__uncompletetask); package.add("uncompletetask", &Perl__uncompletetask);
package.add("firsttaskinset", &Perl__firsttaskinset); package.add("firsttaskinset", &Perl__firsttaskinset);
package.add("follow", (void(*)(int))&Perl__follow); package.add("follow", (void(*)(int))&Perl__follow);
zone/lua_client.cpp
+1
View File
@@ -3675,6 +3675,7 @@ luabind::scope lua_register_client() {
.def("ClearPEQZoneFlag", (void(Lua_Client::*)(uint32))&Lua_Client::ClearPEQZoneFlag) .def("ClearPEQZoneFlag", (void(Lua_Client::*)(uint32))&Lua_Client::ClearPEQZoneFlag)
.def("ClearXTargets", (void(Lua_Client::*)(void))&Lua_Client::ClearXTargets) .def("ClearXTargets", (void(Lua_Client::*)(void))&Lua_Client::ClearXTargets)
.def("ClearZoneFlag", (void(Lua_Client::*)(uint32))&Lua_Client::ClearZoneFlag) .def("ClearZoneFlag", (void(Lua_Client::*)(uint32))&Lua_Client::ClearZoneFlag)
.def("CompleteTask", (bool(Lua_Client::*)(int))&Lua_Client::CompleteTask)
.def("Connected", (bool(Lua_Client::*)(void))&Lua_Client::Connected) .def("Connected", (bool(Lua_Client::*)(void))&Lua_Client::Connected)
.def("CountAugmentEquippedByID", (uint32(Lua_Client::*)(uint32))&Lua_Client::CountAugmentEquippedByID) .def("CountAugmentEquippedByID", (uint32(Lua_Client::*)(uint32))&Lua_Client::CountAugmentEquippedByID)
.def("CountItem", (uint32(Lua_Client::*)(uint32))&Lua_Client::CountItem) .def("CountItem", (uint32(Lua_Client::*)(uint32))&Lua_Client::CountItem)
zone/questmgr.cpp
-1
View File
@@ -2975,7 +2975,6 @@ bool QuestManager::uncompletetask(int task_id) {
if (!RuleB(TaskSystem, EnableTaskSystem) || !initiator) { if (!RuleB(TaskSystem, EnableTaskSystem) || !initiator) {
return false; return false;
} }
return initiator->UncompleteTask(task_id); return initiator->UncompleteTask(task_id);