Merge branch 'dhain' into develop

# Conflicts:
#	Assets/Scripts/Cow.cs
This commit is contained in:
dhain 2022-06-24 08:54:42 +02:00
commit e78fa38433
10 changed files with 140 additions and 110 deletions

View file

@ -43,6 +43,8 @@ namespace Actions {
/// </summary>
private void instantiateNextDayActionHandlers() {
_nextDayActionHandlers.Add(new FarmlandTileNextDayActionHandler());
_nextDayActionHandlers.Add(new ChickenAnimalNextDayActionHandler());
}

View file

@ -82,7 +82,7 @@ namespace Actions {
bool rv = false;
try {
_animal = gameObject.GetComponent<Animal>();
rv = true;
rv = _animal != null;
}
catch { }