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

Fix character creation tenancy operations

Browse Source
This commit is contained in:
Akkadius
2020-03-31 01:49:42 -05:00
parent 019735c654
commit dae20afcba
14 changed files with 186 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.cpp
+3 -2
View File
@@ -5295,8 +5295,9 @@ void Client::SetStartZone(uint32 zoneid, float x, float y, float z)
m_pp.binds[4].instance_id = zone->GetInstanceID();
}
if (x == 0 && y == 0 && z ==0)
database.GetSafePoints(m_pp.binds[4].zoneId, 0, &m_pp.binds[4].x, &m_pp.binds[4].y, &m_pp.binds[4].z);
if (x == 0 && y == 0 && z == 0) {
content_db.GetSafePoints(m_pp.binds[4].zoneId, 0, &m_pp.binds[4].x, &m_pp.binds[4].y, &m_pp.binds[4].z);
}
else {
m_pp.binds[4].x = x;
m_pp.binds[4].y = y;
zone/command.cpp
+41 -12
View File
@@ -7141,22 +7141,51 @@ void command_summonitem(Client *c, const Seperator *sep)
item_status = static_cast<int16>(item->MinStatus);
}
if (item_status > c->Admin())
if (item_status > c->Admin()) {
c->Message(Chat::Red, "Error: Insufficient status to summon this item.");
else if (sep->argnum == 2 && sep->IsNumber(2))
}
else if (sep->argnum == 2 && sep->IsNumber(2)) {
c->SummonItem(itemid, atoi(sep->arg[2]));
else if (sep->argnum == 3)
}
else if (sep->argnum == 3) {
c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]));
else if (sep->argnum == 4)
}
else if (sep->argnum == 4) {
c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]));
else if (sep->argnum == 5)
}
else if (sep->argnum == 5) {
c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]));
else if (sep->argnum == 6)
c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]), atoi(sep->arg[6]));
else if (sep->argnum == 7)
c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]), atoi(sep->arg[6]), atoi(sep->arg[7]));
else if (sep->argnum == 8)
c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]), atoi(sep->arg[6]), atoi(sep->arg[7]), atoi(sep->arg[8]));
}
else if (sep->argnum == 6) {
c->SummonItem(
itemid,
atoi(sep->arg[2]),
atoi(sep->arg[3]),
atoi(sep->arg[4]),
atoi(sep->arg[5]),
atoi(sep->arg[6]));
}
else if (sep->argnum == 7) {
c->SummonItem(
itemid,
atoi(sep->arg[2]),
atoi(sep->arg[3]),
atoi(sep->arg[4]),
atoi(sep->arg[5]),
atoi(sep->arg[6]),
atoi(sep->arg[7]));
}
else if (sep->argnum == 8) {
c->SummonItem(
itemid,
atoi(sep->arg[2]),
atoi(sep->arg[3]),
atoi(sep->arg[4]),
atoi(sep->arg[5]),
atoi(sep->arg[6]),
atoi(sep->arg[7]),
atoi(sep->arg[8]));
}
else {
c->SummonItem(itemid);
}
@@ -7270,7 +7299,7 @@ void command_itemsearch(Client *c, const Seperator *sep)
std::string saylink_commands;
for (auto &amount : amounts) {
saylink_commands += EQEmu::SayLinkEngine::GenerateQuestSaylink(
"#gi " + std::to_string(item->ID) + " " + amount,
"#si " + std::to_string(item->ID) + " " + amount,
false,
"[" + amount + "] "
);