Merge pull request #5600 from Citadel-Station-13/upstream-merge-35780

[MIRROR] Fixed instant summon behavior with simple animals
2018-02-20 15:21:39 +00:00
parent 77f48a3ceb 1be40ba78c
commit c9d36d7ec8
8 changed files with 12 additions and 6 deletions
@@ -101,7 +101,7 @@
 			if(item_to_retrieve.loc)
 				item_to_retrieve.loc.visible_message("<span class='warning'>The [item_to_retrieve.name] suddenly disappears!</span>")
 			if(!L.put_in_hands(item_to_retrieve))
-				item_to_retrieve.forceMove(L.loc)
+				item_to_retrieve.forceMove(L.drop_location())
 				item_to_retrieve.loc.visible_message("<span class='caution'>The [item_to_retrieve.name] suddenly appears!</span>")
 				playsound(get_turf(L), 'sound/magic/summonitems_generic.ogg', 50, 1)
 			else