Skip to content

Bugfix for trigger event ID validation #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rampastring merged 2 commits into from
Jul 28, 2025
Merged

Bugfix for trigger event ID validation #252

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6a1b7b
Fix trigger event ID validation relying on amount of event types vs. …
Starkku Jul 22, 2025
5389f73
Rename variable name to be more descriptive
Rampastring Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/TSMapEditor/Models/Trigger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Rampastring.Tools;
using System;
using System.Collections.Generic;
using TSMapEditor.CCEngine;
using TSMapEditor.Misc;
using TSMapEditor.Models.Enums;

Expand Down Expand Up @@ -179,12 +180,12 @@ public void ParseConditions(string data, EditorConfig editorConfig)
for (int i = 0; i < eventCount; i++)
{
int conditionIndex = Conversions.IntFromString(dataArray[startIndex], -1);
if (conditionIndex >= editorConfig.TriggerEventTypes.Count)
if (!editorConfig.TriggerEventTypes.TryGetValue(conditionIndex, out TriggerEventType triggerEventType))
{
throw new INIConfigException("The map contains a trigger event that is not defined in the editor's config. To prevent data loss, the map cannot be loaded. Event index: " + conditionIndex);
}

bool usesP3 = editorConfig.TriggerEventTypes[conditionIndex].UsesP3;
bool usesP3 = triggerEventType.UsesP3;

var triggerEvent = TriggerCondition.ParseFromArray(dataArray, startIndex, usesP3);
if (triggerEvent == null)
Expand Down
Loading