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:
KimLS
2015-01-30 15:03:02 -08:00
parent faaa98d3f0
commit f388a605dd
12 changed files with 29 additions and 32 deletions
+6 -6
View File
@@ -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);