Improve inventory loading when changing players.

Author: bladecoder

blade-engine/src/com/bladecoder/engine/actions/SetPlayerAction.java

@@ -19,6 +19,7 @@
 import com.bladecoder.engine.assets.EngineAssetManager;
 import com.bladecoder.engine.model.BaseActor;
 import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.Inventory;
 import com.bladecoder.engine.model.Scene;
 import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
@@ -27,34 +28,38 @@
 public class SetPlayerAction implements Action {
 
 	@ActionProperty(type = Type.SCENE_CHARACTER_ACTOR, required = true)
-	@ActionPropertyDescription("The scene player")	
+	@ActionPropertyDescription("The scene player")
 	private SceneActorRef actor;
-	
+
 	@ActionProperty
-	@ActionPropertyDescription("The inventory 'id' for the player. If empty, the inventory will not change.")	
+	@ActionPropertyDescription("The inventory 'id' for the player. If empty, the inventory will not change.")
 	private String inventory;
-	
+
 	private World w;
-	
+
 	@Override
 	public void init(World w) {
 		this.w = w;
 	}
 
 	@Override
-	public boolean run(VerbRunner cb) {		
+	public boolean run(VerbRunner cb) {
 		Scene s = actor.getScene(w);
 
 		BaseActor a = s.getActor(actor.getActorId(), true);
-		
-		s.setPlayer((CharacterActor)a);
-		
-		if(inventory != null) {
-			w.getInventory().dispose();
+
+		s.setPlayer((CharacterActor) a);
+
+		if (inventory != null && !inventory.equals(w.getCurrentInventory())) {
+			Inventory old = w.getInventory();
+
 			w.setInventory(inventory);
 			w.getInventory().loadAssets();
 			EngineAssetManager.getInstance().finishLoading();
 			w.getInventory().retrieveAssets();
+
+			old.dispose();
+
 		}
 
 		return false;