Merge pull request #6680 from Citadel-Station-13/upstream-merge-37727

[MIRROR] [s] Removes some stationloving-related failure surface
2018-05-11 03:44:29 +00:00
parent 993d72ec46 993745218e
commit a980e323b9
3 changed files with 20 additions and 8 deletions
@@ -326,7 +326,10 @@
 		I.plane = initial(I.plane)
 		I.appearance_flags &= ~NO_CLIENT_COLOR
 		if(!no_move && !(I.flags_1 & DROPDEL_1))	//item may be moved/qdel'd immedietely, don't bother moving it
-			I.forceMove(newloc)
+			if (isnull(newloc))
+				I.moveToNullspace()
+			else
+				I.forceMove(newloc)
 		I.dropped(src)
 	return TRUE