diff --git a/tgui/packages/tgui/interfaces/ForceEvent.tsx b/tgui/packages/tgui/interfaces/ForceEvent.tsx index a93ea6a5f43..4811e2fc20f 100644 --- a/tgui/packages/tgui/interfaces/ForceEvent.tsx +++ b/tgui/packages/tgui/interfaces/ForceEvent.tsx @@ -21,13 +21,15 @@ const paginateEvents = (events: Event[], maxPerPage: number): Event[][] => { let maxChars = EVENT_PAGE_MAXCHARS; for (const event of events) { - maxChars -= event.name.length; - if (maxChars <= 0) { - // would overflow the next line over - itemsToAdd = maxPerPage; - maxChars = EVENT_PAGE_MAXCHARS - event.name.length; - pages.push(page); - page = []; + if (event.name && typeof event.name === 'string') { + maxChars -= event.name.length; + if (maxChars <= 0) { + // would overflow the next line over + itemsToAdd = maxPerPage; + maxChars = EVENT_PAGE_MAXCHARS - event.name.length; + pages.push(page); + page = []; + } } page.push(event); itemsToAdd--; @@ -127,7 +129,14 @@ export const EventSection = (props) => { return false; } // remove events not being searched for, if a search is active - if (searchQuery && !event.name.toLowerCase().includes(searchQuery)) { + if ( + searchQuery && + event.name && + typeof event.name === 'string' && + searchQuery && + typeof searchQuery === 'string' && + !event.name.toLowerCase().includes(searchQuery.toLowerCase()) + ) { return false; } return true;