StardewValley
/
Stardew_Valley_Mods
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned concurrent actions when starting a new event and if an event finishes.

This commit is contained in:
JoshuaNavarro 2019-12-05 02:09:31 -08:00
parent b184c654f4
commit 03e338e279
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
GeneralMods/StardustCore/Events/EventManager.cs
View File

@ -22,8 +22,6 @@ namespace StardustCore.Events
public Dictionary<string, Action<EventManager,string>> concurrentEventActions; public Dictionary<string, Action<EventManager,string>> concurrentEventActions;
public bool eventStarted;
public EventManager() public EventManager()
{ {
this.events = new Dictionary<string, EventHelper>(); this.events = new Dictionary<string, EventHelper>();
@ -55,7 +53,6 @@ namespace StardustCore.Events
public void addConcurrentEvent(string EventData,Action<EventManager,string> Function) public void addConcurrentEvent(string EventData,Action<EventManager,string> Function)
{ {
this.concurrentEventActions.Add(EventData, Function); this.concurrentEventActions.Add(EventData, Function);
} }
@ -64,7 +61,14 @@ namespace StardustCore.Events
/// </summary> /// </summary>
public virtual void update() public virtual void update()
{ {
if (Game1.CurrentEvent == null) return; if (Game1.CurrentEvent == null)
{
if (this.concurrentEventActions.Count > 0)
{
this.concurrentEventActions.Clear();
}
return;
}
string commandName = this.getGameCurrentEventCommandStringName(); string commandName = this.getGameCurrentEventCommandStringName();
//HappyBirthday.ModMonitor.Log("Current event command name is: " + commandName, StardewModdingAPI.LogLevel.Info); //HappyBirthday.ModMonitor.Log("Current event command name is: " + commandName, StardewModdingAPI.LogLevel.Info);
@ -111,6 +115,7 @@ namespace StardustCore.Events
{ {
if (this.events.ContainsKey(EventName)) if (this.events.ContainsKey(EventName))
{ {
this.concurrentEventActions.Clear(); //Clean all old parallel actions before starting a new event.
this.events[EventName].startEventAtLocationifPossible(); this.events[EventName].startEventAtLocationifPossible();
} }
} }