mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-16 18:52:22 +00:00
Spelling errors and revised my cle change to put it much lower so it shouldn't have any side effects other than avoiding the crash
This commit is contained in:
+6
-6
@@ -1069,10 +1069,6 @@ void Client::EnterWorld(bool TryBootup) {
|
||||
if (zoneID == 0)
|
||||
return;
|
||||
|
||||
if(!cle) {
|
||||
return;
|
||||
}
|
||||
|
||||
ZoneServer* zs = nullptr;
|
||||
if(instanceID > 0)
|
||||
{
|
||||
@@ -1107,7 +1103,7 @@ void Client::EnterWorld(bool TryBootup) {
|
||||
const char *zone_name=database.GetZoneName(zoneID, true);
|
||||
if (zs) {
|
||||
// warn the world we're comming, so it knows not to shutdown
|
||||
zs->IncommingClient(this);
|
||||
zs->IncomingClient(this);
|
||||
}
|
||||
else {
|
||||
if (TryBootup) {
|
||||
@@ -1121,13 +1117,17 @@ void Client::EnterWorld(bool TryBootup) {
|
||||
return;
|
||||
}
|
||||
else {
|
||||
Log.Out(Logs::Detail, Logs::World_Server,"Requested zone %s is no running.",zone_name);
|
||||
Log.Out(Logs::Detail, Logs::World_Server,"Requested zone %s is not running.",zone_name);
|
||||
ZoneUnavail();
|
||||
return;
|
||||
}
|
||||
}
|
||||
pwaitingforbootup = 0;
|
||||
|
||||
if(!cle) {
|
||||
return;
|
||||
}
|
||||
|
||||
cle->SetChar(charid, char_name);
|
||||
database.UpdateLiveChar(char_name, GetAccountID());
|
||||
Log.Out(Logs::Detail, Logs::World_Server,"%s %s (%d:%d)",seencharsel ? "Entering zone" : "Zoning to",zone_name,zoneID,instanceID);
|
||||
|
||||
Reference in New Issue
Block a user