Changed when room change events are triggered

Author: benpollarduk

NetAF/Assets/Locations/Region.cs

@@ -116,6 +116,8 @@ internal Reaction Enter()
             if (!reaction.ContinueWithTransition)
                 return reaction.Reaction;
 
+            EventBus.Publish(new RoomEntered(CurrentRoom));
+
             EventBus.Publish(new RegionEntered(this));
 
             var introduction = CurrentRoom.Introduction.GetDescription();
@@ -132,11 +134,15 @@ internal Reaction Enter()
         /// <returns>The reaction.</returns>
         internal Reaction Exit()
         {
-            var result = CurrentRoom?.MovedOutOf(this, null).Reaction ?? Reaction.Silent;
+            var result = CurrentRoom?.MovedOutOf(this, null) ?? RoomTransitionReaction.Silent;
 
-            EventBus.Publish(new RegionExited(this));
+            if (result.ContinueWithTransition)
+            {
+                EventBus.Publish(new RoomExited(CurrentRoom));
+                EventBus.Publish(new RegionExited(this));
+            }
 
-            return result;
+            return result.Reaction;
         }
 
         /// <summary>
@@ -241,10 +247,16 @@ public Reaction Move(Direction direction)
 
             if (reaction.ContinueWithTransition)
             {
+                EventBus.Publish(new RoomExited(CurrentRoom));
+
                 reaction = adjoiningRoom.MovedInto(this, CurrentRoom, direction.Inverse());
-                
+
                 if (reaction.ContinueWithTransition)
+                {
                     CurrentRoom = adjoiningRoom;
+
+                    EventBus.Publish(new RoomEntered(CurrentRoom));
+                }
             }
 
             return reaction.Reaction;
@@ -327,6 +339,8 @@ public Reaction JumpToRoom(Point3D location)
             CurrentRoom = roomPosition.Room;
             var reaction = CurrentRoom.MovedInto(this, null);
 
+            EventBus.Publish(new RoomEntered(CurrentRoom));
+
             return reaction.Reaction;
         }
 

NetAF/Assets/Locations/Room.cs

@@ -4,7 +4,6 @@
 using System.Text;
 using NetAF.Assets.Characters;
 using NetAF.Commands;
-using NetAF.Events;
 using NetAF.Extensions;
 using NetAF.Interpretation;
 using NetAF.Rendering;
@@ -456,12 +455,7 @@ internal RoomTransitionReaction MovedInto(Region region, Room adjoiningRoom, Dir
             EnteredFrom = direction;
             HasBeenVisited = true;
 
-            var result = EnterCallback?.Invoke(GetTransition(region, adjoiningRoom, direction)) ?? RoomTransitionReaction.Silent;
-
-            if (result.ContinueWithTransition)
-                EventBus.Publish(new RoomEntered(this));
-                
-            return result;
+            return EnterCallback?.Invoke(GetTransition(region, adjoiningRoom, direction)) ?? RoomTransitionReaction.Silent;
         }
 
         /// <summary>
@@ -473,12 +467,7 @@ internal RoomTransitionReaction MovedInto(Region region, Room adjoiningRoom, Dir
         /// <returns>The reaction to the transition.</returns>
         internal RoomTransitionReaction MovedOutOf(Region region, Room adjoiningRoom, Direction? direction = null)
         {
-            var result = ExitCallback?.Invoke(GetTransition(region, adjoiningRoom, direction)) ?? RoomTransitionReaction.Silent;
-
-            if (result.ContinueWithTransition)
-                EventBus.Publish(new RoomExited(this));
-
-            return result;
+            return ExitCallback?.Invoke(GetTransition(region, adjoiningRoom, direction)) ?? RoomTransitionReaction.Silent;
         }
 
         /// <summary>