diff options
| author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-02-07 20:51:22 -0500 |
|---|---|---|
| committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-02-07 20:51:22 -0500 |
| commit | cec74697866da2d67a62c3a4ef10d605592e4152 (patch) | |
| tree | f61628808e6df44615cec8be479ab7f5e99f7d2b /src/StardewModdingAPI/Events | |
| parent | 95a93a05b39d2b27b538ecdb0e6a18f28096c5c2 (diff) | |
| download | SMAPI-cec74697866da2d67a62c3a4ef10d605592e4152.tar.gz SMAPI-cec74697866da2d67a62c3a4ef10d605592e4152.tar.bz2 SMAPI-cec74697866da2d67a62c3a4ef10d605592e4152.zip | |
disambiguate references to Farmer (#231)
Diffstat (limited to 'src/StardewModdingAPI/Events')
| -rw-r--r-- | src/StardewModdingAPI/Events/EventArgsFarmerChanged.cs | 8 | ||||
| -rw-r--r-- | src/StardewModdingAPI/Events/PlayerEvents.cs | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/StardewModdingAPI/Events/EventArgsFarmerChanged.cs b/src/StardewModdingAPI/Events/EventArgsFarmerChanged.cs index 273f9d25..699d90be 100644 --- a/src/StardewModdingAPI/Events/EventArgsFarmerChanged.cs +++ b/src/StardewModdingAPI/Events/EventArgsFarmerChanged.cs @@ -1,5 +1,5 @@ using System; -using StardewValley; +using SFarmer = StardewValley.Farmer; namespace StardewModdingAPI.Events { @@ -10,10 +10,10 @@ namespace StardewModdingAPI.Events ** Accessors *********/ /// <summary>The previous player character.</summary> - public Farmer NewFarmer { get; } + public SFarmer NewFarmer { get; } /// <summary>The new player character.</summary> - public Farmer PriorFarmer { get; } + public SFarmer PriorFarmer { get; } /********* @@ -22,7 +22,7 @@ namespace StardewModdingAPI.Events /// <summary>Construct an instance.</summary> /// <param name="priorFarmer">The previous player character.</param> /// <param name="newFarmer">The new player character.</param> - public EventArgsFarmerChanged(Farmer priorFarmer, Farmer newFarmer) + public EventArgsFarmerChanged(SFarmer priorFarmer, SFarmer newFarmer) { this.PriorFarmer = priorFarmer; this.NewFarmer = newFarmer; diff --git a/src/StardewModdingAPI/Events/PlayerEvents.cs b/src/StardewModdingAPI/Events/PlayerEvents.cs index 6e65f5ae..99bdac16 100644 --- a/src/StardewModdingAPI/Events/PlayerEvents.cs +++ b/src/StardewModdingAPI/Events/PlayerEvents.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using StardewModdingAPI.Framework; using StardewValley; +using SFarmer = StardewValley.Farmer; namespace StardewModdingAPI.Events { @@ -49,7 +50,7 @@ namespace StardewModdingAPI.Events /// <param name="monitor">Encapsulates monitoring and logging.</param> /// <param name="priorFarmer">The previous player character.</param> /// <param name="newFarmer">The new player character.</param> - internal static void InvokeFarmerChanged(IMonitor monitor, Farmer priorFarmer, Farmer newFarmer) + internal static void InvokeFarmerChanged(IMonitor monitor, SFarmer priorFarmer, SFarmer newFarmer) { if (PlayerEvents.FarmerChanged == null) return; |