diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-09-07 13:06:27 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-09-07 13:06:27 -0400 |
| commit | 5e43bdbf5cd6dbab36c25287c85d42ccfeea2c83 (patch) | |
| tree | 0a42305174eb84561a584549cd685c5e95670f36 /src/SMAPI/Events | |
| parent | 8da88b8fe5b41739c5cd0df3280b9770fc7f10a4 (diff) | |
| parent | f9fac11028354f15d786d5b854608edb10716f79 (diff) | |
| download | SMAPI-5e43bdbf5cd6dbab36c25287c85d42ccfeea2c83.tar.gz SMAPI-5e43bdbf5cd6dbab36c25287c85d42ccfeea2c83.tar.bz2 SMAPI-5e43bdbf5cd6dbab36c25287c85d42ccfeea2c83.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI/Events')
| -rw-r--r-- | src/SMAPI/Events/ChangeType.cs | 2 | ||||
| -rw-r--r-- | src/SMAPI/Events/OneSecondUpdateTickedEventArgs.cs | 2 | ||||
| -rw-r--r-- | src/SMAPI/Events/OneSecondUpdateTickingEventArgs.cs | 2 | ||||
| -rw-r--r-- | src/SMAPI/Events/UnvalidatedUpdateTickedEventArgs.cs | 2 | ||||
| -rw-r--r-- | src/SMAPI/Events/UnvalidatedUpdateTickingEventArgs.cs | 2 | ||||
| -rw-r--r-- | src/SMAPI/Events/UpdateTickedEventArgs.cs | 2 | ||||
| -rw-r--r-- | src/SMAPI/Events/UpdateTickingEventArgs.cs | 2 | ||||
| -rw-r--r-- | src/SMAPI/Events/WarpedEventArgs.cs | 1 |
8 files changed, 7 insertions, 8 deletions
diff --git a/src/SMAPI/Events/ChangeType.cs b/src/SMAPI/Events/ChangeType.cs index 4b207f08..0fc717df 100644 --- a/src/SMAPI/Events/ChangeType.cs +++ b/src/SMAPI/Events/ChangeType.cs @@ -12,4 +12,4 @@ namespace StardewModdingAPI.Events /// <summary>The stack size changed.</summary> StackChange } -}
\ No newline at end of file +} diff --git a/src/SMAPI/Events/OneSecondUpdateTickedEventArgs.cs b/src/SMAPI/Events/OneSecondUpdateTickedEventArgs.cs index 48e08e5e..608bdc69 100644 --- a/src/SMAPI/Events/OneSecondUpdateTickedEventArgs.cs +++ b/src/SMAPI/Events/OneSecondUpdateTickedEventArgs.cs @@ -10,7 +10,7 @@ namespace StardewModdingAPI.Events ** Accessors *********/ /// <summary>The number of ticks elapsed since the game started, including the current tick.</summary> - public uint Ticks => SGame.TicksElapsed; + public uint Ticks => SCore.TicksElapsed; /********* diff --git a/src/SMAPI/Events/OneSecondUpdateTickingEventArgs.cs b/src/SMAPI/Events/OneSecondUpdateTickingEventArgs.cs index 58cf802a..f30a2245 100644 --- a/src/SMAPI/Events/OneSecondUpdateTickingEventArgs.cs +++ b/src/SMAPI/Events/OneSecondUpdateTickingEventArgs.cs @@ -10,7 +10,7 @@ namespace StardewModdingAPI.Events ** Accessors *********/ /// <summary>The number of ticks elapsed since the game started, excluding the upcoming tick.</summary> - public uint Ticks => SGame.TicksElapsed; + public uint Ticks => SCore.TicksElapsed; /********* diff --git a/src/SMAPI/Events/UnvalidatedUpdateTickedEventArgs.cs b/src/SMAPI/Events/UnvalidatedUpdateTickedEventArgs.cs index 258e2f99..ff635787 100644 --- a/src/SMAPI/Events/UnvalidatedUpdateTickedEventArgs.cs +++ b/src/SMAPI/Events/UnvalidatedUpdateTickedEventArgs.cs @@ -10,7 +10,7 @@ namespace StardewModdingAPI.Events ** Accessors *********/ /// <summary>The number of ticks elapsed since the game started, including the current tick.</summary> - public uint Ticks => SGame.TicksElapsed; + public uint Ticks => SCore.TicksElapsed; /// <summary>Whether <see cref="Ticks"/> is a multiple of 60, which happens approximately once per second.</summary> public bool IsOneSecond => this.Ticks % 60 == 0; diff --git a/src/SMAPI/Events/UnvalidatedUpdateTickingEventArgs.cs b/src/SMAPI/Events/UnvalidatedUpdateTickingEventArgs.cs index e3c8b3ee..4a01c98b 100644 --- a/src/SMAPI/Events/UnvalidatedUpdateTickingEventArgs.cs +++ b/src/SMAPI/Events/UnvalidatedUpdateTickingEventArgs.cs @@ -10,7 +10,7 @@ namespace StardewModdingAPI.Events ** Accessors *********/ /// <summary>The number of ticks elapsed since the game started, excluding the upcoming tick.</summary> - public uint Ticks => SGame.TicksElapsed; + public uint Ticks => SCore.TicksElapsed; /// <summary>Whether <see cref="Ticks"/> is a multiple of 60, which happens approximately once per second.</summary> public bool IsOneSecond => this.Ticks % 60 == 0; diff --git a/src/SMAPI/Events/UpdateTickedEventArgs.cs b/src/SMAPI/Events/UpdateTickedEventArgs.cs index 4f3329ac..ce01ba1e 100644 --- a/src/SMAPI/Events/UpdateTickedEventArgs.cs +++ b/src/SMAPI/Events/UpdateTickedEventArgs.cs @@ -10,7 +10,7 @@ namespace StardewModdingAPI.Events ** Accessors *********/ /// <summary>The number of ticks elapsed since the game started, including the current tick.</summary> - public uint Ticks => SGame.TicksElapsed; + public uint Ticks => SCore.TicksElapsed; /// <summary>Whether <see cref="Ticks"/> is a multiple of 60, which happens approximately once per second.</summary> public bool IsOneSecond => this.Ticks % 60 == 0; diff --git a/src/SMAPI/Events/UpdateTickingEventArgs.cs b/src/SMAPI/Events/UpdateTickingEventArgs.cs index 0d3187cd..483142ec 100644 --- a/src/SMAPI/Events/UpdateTickingEventArgs.cs +++ b/src/SMAPI/Events/UpdateTickingEventArgs.cs @@ -10,7 +10,7 @@ namespace StardewModdingAPI.Events ** Accessors *********/ /// <summary>The number of ticks elapsed since the game started, excluding the upcoming tick.</summary> - public uint Ticks => SGame.TicksElapsed; + public uint Ticks => SCore.TicksElapsed; /// <summary>Whether <see cref="Ticks"/> is a multiple of 60, which happens approximately once per second.</summary> public bool IsOneSecond => this.Ticks % 60 == 0; diff --git a/src/SMAPI/Events/WarpedEventArgs.cs b/src/SMAPI/Events/WarpedEventArgs.cs index 95c53ad9..9afe4a4e 100644 --- a/src/SMAPI/Events/WarpedEventArgs.cs +++ b/src/SMAPI/Events/WarpedEventArgs.cs @@ -22,7 +22,6 @@ namespace StardewModdingAPI.Events public bool IsLocalPlayer => this.Player.IsLocalPlayer; - /********* ** Public methods *********/ |