Merge branch 'master' into inv2

2026-06-25 10:28:23 +00:00 · 2015-04-07 16:29:07 -07:00
parent 56e7d1b0dc 0321bf72a5
commit ff3cb9fc54
30 changed files with 407 additions and 133 deletions
@@ -1318,8 +1318,10 @@ bool ZoneServer::Process() {
 				break;
 			}
 		}
-
-		delete pack;
+		if (pack)
+			delete pack;
+		else
+			Log.Out(Logs::Detail, Logs::World_Server, "Zoneserver process tried to delete pack when pack does not exist.");
 	}
 	return true;
 }