mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2024-11-22 21:47:24 +00:00
remove unused code and callbacktimers in testmap (#620)
This commit is contained in:
parent
3865a186a7
commit
dddc33607b
@ -1519,36 +1519,12 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
|
|||||||
const auto objid = entity->GetObjectID();
|
const auto objid = entity->GetObjectID();
|
||||||
|
|
||||||
if (force || CheckIfAccessibleZone(reqZone)) { // to prevent tomfoolery
|
if (force || CheckIfAccessibleZone(reqZone)) { // to prevent tomfoolery
|
||||||
bool darwin = true; //Putting this on true, as I'm sick of having to wait 3-4 seconds on a transfer while trying to quickly moderate properties
|
|
||||||
|
|
||||||
Character* character = entity->GetCharacter();
|
ZoneInstanceManager::Instance()->RequestZoneTransfer(Game::server, reqZone, cloneId, false, [objid](bool mythranShift, uint32_t zoneID, uint32_t zoneInstance, uint32_t zoneClone, std::string serverIP, uint16_t serverPort) {
|
||||||
if (character) {
|
|
||||||
std::string lowerName = character->GetName();
|
|
||||||
std::transform(lowerName.begin(), lowerName.end(), lowerName.begin(), ::tolower);
|
|
||||||
// feel free to add your name to the list
|
|
||||||
if (lowerName.find("max") != std::string::npos || lowerName.find("darwin") != std::string::npos || lowerName.find("gie") != std::string::npos) {
|
|
||||||
darwin = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!darwin) {
|
|
||||||
GameMessages::SendPlayAnimation(entity, u"lup-teleport");
|
|
||||||
GameMessages::SendSetStunned(objid, PUSH, user->GetSystemAddress(),
|
|
||||||
LWOOBJID_EMPTY, true, true, true, true, true, true, true, true
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
ZoneInstanceManager::Instance()->RequestZoneTransfer(Game::server, reqZone, cloneId, false, [objid, darwin](bool mythranShift, uint32_t zoneID, uint32_t zoneInstance, uint32_t zoneClone, std::string serverIP, uint16_t serverPort) {
|
|
||||||
auto* entity = EntityManager::Instance()->GetEntity(objid);
|
auto* entity = EntityManager::Instance()->GetEntity(objid);
|
||||||
|
if (!entity) return;
|
||||||
|
|
||||||
if (entity == nullptr) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
float transferTime = 3.32999992370605f;
|
|
||||||
if (darwin) transferTime = 0.0f;
|
|
||||||
|
|
||||||
entity->AddCallbackTimer(transferTime, [=] {
|
|
||||||
const auto sysAddr = entity->GetSystemAddress();
|
const auto sysAddr = entity->GetSystemAddress();
|
||||||
|
|
||||||
ChatPackets::SendSystemMessage(sysAddr, u"Transfering map...");
|
ChatPackets::SendSystemMessage(sysAddr, u"Transfering map...");
|
||||||
@ -1564,7 +1540,6 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
|
|||||||
entity->GetCharacter()->SaveXMLToDatabase();
|
entity->GetCharacter()->SaveXMLToDatabase();
|
||||||
|
|
||||||
WorldPackets::SendTransferToWorld(sysAddr, serverIP, serverPort, mythranShift);
|
WorldPackets::SendTransferToWorld(sysAddr, serverIP, serverPort, mythranShift);
|
||||||
});
|
|
||||||
return;
|
return;
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user